svn commit: r1407470 - /subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py

[st...@apache.org]

Author: stsp
Date: Fri Nov  9 14:36:08 2012
New Revision: 1407470

URL: http://svn.apache.org/viewvc?rev=1407470&view=rev
Log:
On the 1.7.x branch, directly commit an obvious follow-up fix to r1399178,
with +1 votes from philip and brane, to fix a test failure on Windows.

See for discussion: http://svn.haxx.se/dev/archive-2012-11/0279.shtml

* subversion/tests/cmdline/patch_tests.py
  (patch_target_no_eol_at_eof): Don't hardcode a forward slash separator
   in expected output. Use os.path.join() correctly instead.

Modified:
    subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py

Modified: subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py?rev=1407470&r1=1407469&r2=1407470&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/patch_tests.py Fri Nov  9 14:36:08 2012
@@ -3939,7 +3939,7 @@ def patch_target_no_eol_at_eof(sbox):
     "context", # no newline at end of file
   ]
   expected_output = [
-    'U         %s\n' % os.path.join(wc_dir, 'A/mu'),
+    'U         %s\n' % os.path.join(wc_dir, 'A', 'mu'),
     'U         %s\n' % os.path.join(wc_dir, 'iota'),
   ]