Skip to content

Commit a7943d8

Browse files
authored
Merge pull request #19234 from github/oscarsj/csharp-disable-nuget-tests
Disable csharp tests that use nuget on macos-15
2 parents 866fc6b + 5e74bdc commit a7943d8

File tree

5 files changed

+25
-7
lines changed
  • csharp/ql/integration-tests
    • all-platforms/diag_missing_project_files
    • posix
      • standalone_dependencies_no_framework
      • standalone_dependencies_nuget with_space
      • standalone_dependencies_nuget_no_sources
      • standalone_dependencies_nuget

5 files changed

+25
-7
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
import pytest
2+
import runs_on
3+
4+
5+
# Skipping the test on macos-15, as we're running into trouble.
6+
@pytest.mark.only_if(not runs_on.macos_15)
17
def test(codeql, csharp):
28
codeql.database.create(_assert_failure=True)

csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/test.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import os
44

55

6-
# Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.
7-
@pytest.mark.only_if(runs_on.linux or (runs_on.macos and runs_on.x86_64))
6+
# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
7+
@pytest.mark.only_if(
8+
runs_on.linux
9+
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
10+
)
811
def test(codeql, csharp):
912
os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_DOTNET_FRAMEWORK_REFERENCES"] = (
1013
"/non-existent-path"

csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/test.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import pytest
44

55

6-
# Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.
7-
@pytest.mark.only_if(runs_on.linux or (runs_on.macos and runs_on.x86_64))
6+
# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
7+
@pytest.mark.only_if(
8+
runs_on.linux
9+
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
10+
)
811
def test(codeql, csharp):
912
# making sure we're not doing any fallback restore:
1013
os.environ["CODEQL_EXTRACTOR_CSHARP_BUILDLESS_NUGET_FEEDS_CHECK_FALLBACK_TIMEOUT"] = "1"

csharp/ql/integration-tests/posix/standalone_dependencies_nuget/test.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
import pytest
33

44

5-
# Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.
6-
@pytest.mark.only_if(runs_on.linux or (runs_on.macos and runs_on.x86_64))
5+
# Skipping the test on the ARM runners and macos-15, as we're running into trouble with Mono and nuget.
6+
@pytest.mark.only_if(
7+
runs_on.linux
8+
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
9+
)
710
def test(codeql, csharp):
811
codeql.database.create(build_mode="none")

csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44

55
# Skipping the test on the ARM runners, as we're running into trouble with Mono and nuget.
6-
@pytest.mark.only_if(runs_on.linux or (runs_on.macos and runs_on.x86_64))
6+
@pytest.mark.only_if(
7+
runs_on.linux
8+
or (runs_on.macos and runs_on.x86_64 and not runs_on.macos_15)
9+
)
710
def test(codeql, csharp):
811
codeql.database.create(source_root="proj", build_mode="none")

0 commit comments

Comments
 (0)