Skip to content

Commit df5c071

Browse files
ben-c-at-mozphilimon-reset
authored andcommitted
fix ci flow for windows
1 parent 1496f19 commit df5c071

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.github/workflows/smoke.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
113113
Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
114114
pipenv run python choose_ci_set.py
115-
pipenv run pytest -n 4 $(cat selected_tests)
115+
Start-Process pipenv run pytest -ArgumentList (Get-Content .\selected_tests) -wait -NoNewWindow
116116
$env:TEST_EXIT_CODE = $LASTEXITCODE
117117
mv artifacts artifacts-win || true
118118
exit $env:TEST_EXIT_CODE
@@ -125,7 +125,7 @@ jobs:
125125
mv ./ci_pyproject_headed.toml ./pyproject.toml;
126126
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
127127
pipenv run python choose_ci_set.py
128-
pipenv run pytest $(cat selected_tests)
128+
Start-Process pipenv run pytest -ArgumentList (Get-Content .\selected_tests) -wait -NoNewWindow
129129
$env:TEST_EXIT_CODE = $LASTEXITCODE
130130
rm artifacts/assets -r -Force
131131
Get-ChildItem -Path "artifacts" | ForEach-Object {

ci_pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ markers = [
1414
"locale_gb: tests run in GB locale versions",
1515
"noxvfb: tests that should not run in xvfb sessions"
1616
]
17-
18-
addopts = "-vs --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
17+
testpaths = [
18+
"tests"
19+
]
20+
addopts = "-vs -n 4 --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
1921

2022
[tool.ruff]
2123
target-version = "py310"

ci_xvfb_pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ markers = [
1414
"locale_gb: tests run in GB locale versions",
1515
"noxvfb: tests that should not run in xvfb sessions"
1616
]
17-
addopts = "-vs --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not unstable and not headed and not noxvfb' --html=artifacts/report.html"
17+
testpaths = [
18+
"tests"
19+
]
20+
addopts = "-vs -n 4 --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not unstable and not headed and not noxvfb' --html=artifacts/report.html"
1821

1922
[tool.ruff]
2023
target-version = "py310"

0 commit comments

Comments
 (0)