svn commit: r1332190 - /subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Mon Apr 30 13:25:07 2012
New Revision: 1332190

URL: http://svn.apache.org/viewvc?rev=1332190&view=rev
Log:
Fix test failure on Windows from r1332174.

* subversion/tests/cmdline/merge_symmetric_tests.py
  (expected_symmetric_merge_output): Use os.path.sep instead of '/'.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1332190&r1=1332189&r2=1332190&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Mon Apr 30 13:25:07 2012
@@ -238,7 +238,7 @@ def expected_symmetric_merge_output(targ
   # Match any content modifications; but not of the root of the branch
   # because we don't intentionally modify the branch root node in most
   # tests and we don't want to accidentally overlook a mergeinfo change.
-  lines = ["(A |D |[UG] | [UG]|[UG][UG])   " + target + "/.*\n"]
+  lines = ["(A |D |[UG] | [UG]|[UG][UG])   " + target + os.path.sep + ".*\n"]
 
   # Match mergeinfo changes.  (### Subtrees are not yet supported here.)
   lines += [" [UG]   " + target + "\n"]