svn commit: r1845751 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[br...@apache.org]

Author: brane
Date: Mon Nov  5 02:10:57 2018
New Revision: 1845751

URL: http://svn.apache.org/viewvc?rev=1845751&view=rev
Log:
Following up to r1845750, adjust the trojan tree to fix test failures.

* subversion/tests/cmdline/svntest/main.py (trojan_state):
   - Remove 'D/tau@.' because it can't be created on Windows.
   - Remove 'G/rho@_' because it's redundant with 'G/_@gamma'..
   - Add '@@' and 'A/@@' to test double-@ parsing.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1845751&r1=1845750&r2=1845751&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Mon Nov  5 02:10:57 2018
@@ -282,9 +282,11 @@ trojan_state = svntest.wc.State('', {
   'lambda@'     : Item("This is the file 'lambda'.\n"),
   '@omicron@'   : Item("This is the file 'omicron'.\n"),
   '@'           : Item(),
+  '@@'          : Item(),
   '_@'          : Item(),
   '.@'          : Item(),
   'A'           : Item(),
+  'A/@@'        : Item("This is the file 'A/@@'.\n"),
   'A/alpha'     : Item("This is the file 'alpha'.\n"),
   'A/@omega@'   : Item("This is the file 'omega'.\n"),
   'B'           : Item(),
@@ -294,11 +296,9 @@ trojan_state = svntest.wc.State('', {
   'G'           : Item(),
   'G/_@'        : Item("This is the file 'G/_@'.\n"),
   'G/_@gamma'   : Item("This is the file 'gamma'.\n"),
-  'G/rho@_'     : Item("This is the file 'rho'.\n"),
   'D'           : Item(),
   'D/.@'        : Item("This is the file 'D/.@'.\n"),
   'D/.@delta'   : Item("This is the file 'delta'.\n"),
-  'D/tau@.'     : Item("This is the file 'tau'.\n"),
   'E'           : Item(),
   })