Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test macOS on CI #1752

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Test macOS on CI #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2813e94
Add macOS test jobs to CI matrix
EliahKagan Dec 1, 2023
789baa1
Use macOS 13 on CI
EliahKagan Dec 1, 2023
f6f335f
Temporarily break test_blocking_lock_file on Windows
EliahKagan Dec 1, 2023
c16e4f3
Restore longer extra time for Windows, and add for macOS
EliahKagan Dec 1, 2023
d15f891
macOS needs even more extra time in test_blocking_lock_file
EliahKagan Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pythonpackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest"]
os: ["ubuntu-latest", "macos-13", "windows-latest"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- experimental: false
Expand Down
4 changes: 3 additions & 1 deletion test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,9 @@ def test_blocking_lock_file(self):
elapsed = time.time() - start
extra_time = 0.02
if os.name == "nt" or sys.platform == "cygwin":
extra_time *= 6 # NOTE: Indeterministic failures without this...
extra_time *= 6 # Without this, we get indeterministic failures on Windows.
elif sys.platform == "darwin":
extra_time *= 9 # The situation on macOS is similar, but with more delay.
self.assertLess(elapsed, wait_time + extra_time)

def test_user_id(self):
Expand Down
Loading