Author: dannas
Date: Fri Sep 3 18:17:12 2010
New Revision: 992402
URL: http://svn.apache.org/viewvc?rev=992402&view=rev
Log:
Make some diff tests not depend on ordering of output.
There is no guarentee that all RA layers will return the
information in the same order.
* subversion/tests/cmdline/diff_tests.py
(diff_git_format_wc_wc,
diff_git_format_url_wc,
diff_git_format_url_url): Don't depend on ordering for output.
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=992402&r1=992401&r2=992402&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Sep 3 18:17:12
2010
@@ -3409,7 +3409,9 @@ def diff_git_format_wc_wc(sbox):
"+Changed 'iota'.\n",
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
+ expected = svntest.verify.UnorderedOutput(expected_output)
+
+ svntest.actions.run_and_verify_svn(None, expected, [], 'diff',
'--git', wc_dir)
def diff_git_format_url_wc(sbox):
@@ -3445,7 +3447,9 @@ def diff_git_format_url_wc(sbox):
"+Changed 'iota'.\n",
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
+ expected = svntest.verify.UnorderedOutput(expected_output)
+
+ svntest.actions.run_and_verify_svn(None, expected, [], 'diff',
'--git',
'--old', repo_url + '@1', '--new',
wc_dir)
@@ -3485,7 +3489,9 @@ def diff_git_format_url_url(sbox):
"+Changed 'iota'.\n",
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
+ expected = svntest.verify.UnorderedOutput(expected_output)
+
+ svntest.actions.run_and_verify_svn(None, expected, [], 'diff',
'--git',
'--old', repo_url + '@1', '--new',
repo_url + '@2')
