Author: dannas
Date: Sat Jul 10 19:36:10 2010
New Revision: 962906
URL: http://svn.apache.org/viewvc?rev=962906&view=rev
Log:
Follow-up to r962905. Use '/' as separators for paths in diff tests.
* subversion/tests/cmdline/svnlook_tests.py
(test_print_property_diffs,
diff_ignore_eolstyle): Use paths with '/' as separators when replacing
diff paths with different anchors.
Modified:
subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnlook_tests.py?rev=962906&r1=962905&r2=962906&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnlook_tests.py Sat Jul 10
19:36:10 2010
@@ -267,9 +267,12 @@ def test_print_property_diffs(sbox):
if len(output) != len(expected_output):
raise svntest.Failure
+ canonical_iota_path = iota_path.replace(os.path.sep, '/')
+
# replace wcdir/iota with iota in expected_output
for i in range(len(expected_output)):
- expected_output[i] = expected_output[i].replace(iota_path, 'iota')
+ expected_output[i] = expected_output[i].replace(canonical_iota_path,
+ 'iota')
# Check that the header filenames match.
if expected_output[2].split()[1] != output[2].split()[1]:
@@ -528,6 +531,8 @@ def diff_ignore_eolstyle(sbox):
'--ignore-eol-style', repo_dir, '/A/mu')
rev += 1
+ canonical_mu_path = mu_path.replace(os.path.sep, '/')
+
# replace wcdir/A/mu with A/mu in expected_output
for i in range(len(expected_output)):
expected_output[i] = expected_output[i].replace(mu_path, 'A/mu')
