Author: dannas
Date: Fri Jul 30 11:51:08 2010
New Revision: 980744
URL: http://svn.apache.org/viewvc?rev=980744&view=rev
Log:
Follow-up to r980730. Fix Windows failure due to wrong path separators.
* subversion/tests/cmdline/diff_tests.py
(diff_prop_multiple_hunks): Use make_diff_header() that replaces all
platform specific separators with '/' that is used consistently in
the diff format.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=980744&r1=980743&r2=980744&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Jul 30 11:51:08
2010
@@ -3474,13 +3474,10 @@ def diff_prop_multiple_hunks(sbox):
])
svntest.main.run_svn(None,
"propset", "prop", prop_val, iota_path)
- expected_output = [
- "Index: %s\n" % iota_path,
- "===================================================================\n",
- "--- %s\t(revision 2)\n" % iota_path,
- "+++ %s\t(working copy)\n" % iota_path,
+ expected_output = make_diff_header(iota_path, 'revision 2',
+ 'working copy') + [
"\n",
- "Property changes on: %s\n" % iota_path,
+ "Property changes on: %s\n" % iota_path.replace('\\', '/'),
"___________________________________________________________________\n",
"Modified: prop\n",
"## -1,6 +1,7 ##\n",
