subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1291726 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py
Date Tue, 21 Feb 2012 12:04:06 GMT
Author: philip
Date: Tue Feb 21 12:04:06 2012
New Revision: 1291726

URL: http://svn.apache.org/viewvc?rev=1291726&view=rev
Log:
Tweak two regression tests so that they does not depend on APR hash order.

* subversion/tests/cmdline/diff_tests.py
  (diff_base_to_repos, diff_git_empty_files): Use UnorderedOutput.

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=1291726&r1=1291725&r2=1291726&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Tue Feb 21 12:04:06 2012
@@ -1169,6 +1169,9 @@ def diff_base_to_repos(sbox):
     if not re_infoline.match(line):
       list2.append(line)
 
+  # Two files in diff may be in any order.
+  list1 = svntest.verify.UnorderedOutput(list1)
+
   svntest.verify.compare_and_display_lines('', '', list1, list2)
 
 
@@ -3587,6 +3590,9 @@ def diff_git_empty_files(sbox):
   ] + make_git_diff_header(iota_path, "iota", "revision 2", "working copy",
                            delete=True, text_changes=False)
 
+  # Two files in diff may be in any order.
+  expected_output = svntest.verify.UnorderedOutput(expected_output)
+
   svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
                                      '--git', wc_dir)
 



Mime
View raw message