Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c16e4f3

Browse filesBrowse files
EliahKaganEliahKagan
committed
Restore longer extra time for Windows, and add for macOS
This undoes the testing breakage of test_blocking_lock_file for Windows, and gives macOS the same amount of extra time as Windows. I had expected that macOS, even though it needs more time than Ubuntu, might not need as much extra time as Windows. That turned out not to be the case, in the limited testing done so far on CI. Windows, while still slower than Ubuntu and still too slow to reliably pass the test_blocking_lock_file test, was usually faster than macOS and passed more often. These relative timings may turn out not to be a trend and only to apply to the current GHA runners. That's probably okay since the adjustment for macOS wasn't present before and is being added to allow newly introduced macOS CI test jobs to pass. That is all in regard to the very specific issue of the extra time required for the test_blocking_lock_file test after the lock, which makes an assertion about that not taking too long. Regarding the overall time of entire test jobs, macOS 13 seems to have usually been a little faster than macOS 12, so it is retained. Unlike "macos-latest", which currently is macOS 12, "macos-13" will never refer to a later version of the operating system, so the version given in the workflow should be revisited later, at or after the time "macos-latest" becomes a synonym of "macos-13".
1 parent f6f335f commit c16e4f3
Copy full SHA for c16e4f3

File tree

1 file changed

+1
-1
lines changed
Filter options

1 file changed

+1
-1
lines changed

‎test/test_util.py

Copy file name to clipboardExpand all lines: test/test_util.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ def test_blocking_lock_file(self):
397397
self.assertRaises(IOError, wait_lock._obtain_lock)
398398
elapsed = time.time() - start
399399
extra_time = 0.02
400-
if sys.platform == "cygwin": # FIXME: Put back native Windows check.
400+
if os.name == "nt" or sys.platform == "cygwin" or sys.platform == "darwin":
401401
extra_time *= 6 # NOTE: Indeterministic failures without this...
402402
self.assertLess(elapsed, wait_time + extra_time)
403403

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.