Skip to content

Skip csharp integration tests on macos-26 #21339

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

Merged
oscarsj merged 9 commits into from
Feb 18, 2026
Merged

Skip csharp integration tests on macos-26 #21339

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0676ba1
Skip csharp integration tests on macos-26
oscarsj Feb 17, 2026
5cf281a
Apply suggestions from code review
oscarsj Feb 17, 2026
9efe112
Initial plan
Copilot Feb 17, 2026
004ebd3
Centralize mono/nuget skip predicate in conftest.py
Copilot Feb 17, 2026
60b8213
Remove unused pytest import from conftest.py
Copilot Feb 17, 2026
0b31ca4
Merge pull request #21340 from github/copilot/sub-pr-21339
oscarsj Feb 17, 2026
6029566
Merge branch 'main' into oscarsj/skip-csharp-integration-on-macos-26
oscarsj Feb 17, 2026
6760390
Fix imports
oscarsj Feb 17, 2026
fa73cd5
Remove unnecessary blank line in test.py
oscarsj Feb 17, 2026
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
6 changes: 4 additions & 2 deletions csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
import os


# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
# Skipping the test on the ARM runners, macos-15 and macos-26, as we're running
# into trouble with Mono and nuget.
@pytest.mark.only_if(
runs_on.linux
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
or (runs_on.macos and runs_on.x86_64
and not runs_on.macos_15 and not runs_on.macos_26)
)
def test(codeql, csharp):
os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_DOTNET_FRAMEWORK_REFERENCES"] = (
Expand Down
6 changes: 4 additions & 2 deletions csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
import pytest


# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
# Skipping the test on the ARM runners, macos-15 and macos-26, as we're running
# into trouble with Mono and nuget.
@pytest.mark.only_if(
runs_on.linux
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
or (runs_on.macos and runs_on.x86_64
and not runs_on.macos_15 and not runs_on.macos_26)
)
def test(codeql, csharp):
# making sure we're not doing any fallback restore:
Expand Down
6 changes: 4 additions & 2 deletions csharp/ql/integration-tests/posix/standalone_dependencies_nuget/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
import pytest


# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
# Skipping the test on the ARM runners, macos-15 and macos-26, as we're running
# into trouble with Mono and nuget.
@pytest.mark.only_if(
runs_on.linux
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
or (runs_on.macos and runs_on.x86_64
and not runs_on.macos_15 and not runs_on.macos_26)
)
def test(codeql, csharp):
codeql.database.create(build_mode="none")
6 changes: 4 additions & 2 deletions csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
import pytest


# Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.
# Skipping the test on the ARM runners, macos-15 and macos-26, as we're running
# into trouble with Mono and nuget.
@pytest.mark.only_if(
runs_on.linux
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
or (runs_on.macos and runs_on.x86_64
and not runs_on.macos_15 and not runs_on.macos_26)
)
Copy link

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This skip predicate (and its accompanying comment) is duplicated across multiple test files in this PR. To reduce duplication and keep the excluded macOS version list consistent, consider centralizing the predicate in a shared helper (e.g., a variable/fixture in conftest.py or a small utility function) and reusing it across these tests.

See below for a potential fix:

def _supports_mono_nuget():
    return (
        runs_on.linux
        or (
            runs_on.macos
            and runs_on.x86_64
            and not runs_on.macos_15
            and not runs_on.macos_26
        )
    )


@pytest.mark.only_if(_supports_mono_nuget())

Copilot uses AI. Check for mistakes.
Copy link
Member Author

@oscarsj oscarsj Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot can you implement this suggestion?

def test(codeql, csharp):
codeql.database.create(source_root="proj", build_mode="none")
Loading