subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1833577 - /subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Date Fri, 15 Jun 2018 05:58:29 GMT
Author: julianfoad
Date: Fri Jun 15 05:58:29 2018
New Revision: 1833577

URL: http://svn.apache.org/viewvc?rev=1833577&view=rev
Log:
* subversion/tests/cmdline/shelf_tests.py
  (list_shelves): Don't check ordering, as shelf timestamps may not differ.

Modified:
    subversion/trunk/subversion/tests/cmdline/shelf_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1833577&r1=1833576&r2=1833577&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Fri Jun 15 05:58:29 2018
@@ -605,16 +605,19 @@ def list_shelves(sbox):
   svntest.actions.run_and_verify_svn(None, [],
                                      'shelf-save', 'bar', '-m', 'log msg')
 
+  # We don't check for time-ordering of the shelves. If we want to do so, we
+  # would need to sleep for timestamps to differ, between creating them.
+
   # a quiet list
-  expected_out = svntest.verify.RegexListOutput(['foo', 'bar'])
+  expected_out = svntest.verify.UnorderedRegexListOutput(['foo', 'bar'])
   svntest.actions.run_and_verify_svn(expected_out, [],
                                      'shelf-list', '-q')
 
   # a detailed list
-  expected_out = svntest.verify.RegexListOutput(['foo .* 1 path.*',
-                                                 ' log msg',
-                                                 'bar .* 1 path.*',
-                                                 ' log msg'])
+  expected_out = svntest.verify.UnorderedRegexListOutput(['foo .* 1 path.*',
+                                                          ' log msg',
+                                                          'bar .* 1 path.*',
+                                                          ' log msg'])
   svntest.actions.run_and_verify_svn(expected_out, [],
                                      'shelf-list')
 



Mime
View raw message