Author: jun66j5
Date: Sat Jan 6 07:37:46 2024
New Revision: 1915101
URL: http://svn.apache.org/viewvc?rev=1915101&view=rev
Log:
Follow-up to r1905955, fix randomly failing store_pristine_tests.py 9, 10, 11
and 12 due to `apr_stat` which gives only a resolution of seconds on macOS.
* subversion/tests/cmdline/store_pristine_tests.py
(simple_diff_with_pristine): Sleep for timestamps change.
(simple_diff_without_pristine): Ditto.
(simple_revert_with_pristine): Ditto.
(simple_revert_without_pristine): Ditto.
Modified:
subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py?rev=1915101&r1=1915100&r2=1915101&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py Sat Jan
6 07:37:46 2024
@@ -25,7 +25,7 @@
######################################################################
# General modules
-import os, logging, base64, functools
+import os, logging, base64, functools, time
# Our testing module
import svntest
@@ -351,6 +351,9 @@ def simple_diff_with_pristine(sbox):
sbox.simple_add('file')
sbox.simple_commit(message='r1')
+ # Sleep to ensure timestamps change
+ time.sleep(1.1)
+
sbox.simple_append('file', 'bar\n', truncate=True)
diff_output = svntest.verify.make_diff_header(
@@ -383,6 +386,9 @@ def simple_diff_without_pristine(sbox):
sbox.simple_add('file')
sbox.simple_commit(message='r1')
+ # Sleep to ensure timestamps change
+ time.sleep(1.1)
+
sbox.simple_append('file', 'bar\n', truncate=True)
diff_output = svntest.verify.make_diff_header(
@@ -415,6 +421,9 @@ def simple_revert_with_pristine(sbox):
sbox.simple_add('file')
sbox.simple_commit(message='r1')
+ # Sleep to ensure timestamps change
+ time.sleep(1.1)
+
sbox.simple_append('file', 'bar\n', truncate=True)
svntest.actions.run_and_verify_revert([sbox.ospath('file')])
@@ -447,6 +456,9 @@ def simple_revert_without_pristine(sbox)
sbox.simple_add('file')
sbox.simple_commit(message='r1')
+ # Sleep to ensure timestamps change
+ time.sleep(1.1)
+
sbox.simple_append('file', 'bar\n', truncate=True)
svntest.actions.run_and_verify_revert([sbox.ospath('file')])
