Skip to content

Commit 96ad664

Browse files
committed
Revert "fix ci flow for windows"
This reverts commit 602cedd.
1 parent fb96e1f commit 96ad664

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/workflows/smoke.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +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-
$selected_tests = Get-Content -Path .\selected_tests -Raw
116-
Set-Content -Path .\selected_tests -Value ("run" + "`r`n" + "pytest" + "`r`n" + $selected_tests)
117-
Start-Process pipenv -ArgumentList (Get-Content .\selected_tests) -wait -NoNewWindow
115+
pipenv run pytest -n 4 $(cat selected_tests)
118116
$env:TEST_EXIT_CODE = $LASTEXITCODE
119117
mv artifacts artifacts-win || true
120118
exit $env:TEST_EXIT_CODE
@@ -127,9 +125,7 @@ jobs:
127125
mv ./ci_pyproject_headed.toml ./pyproject.toml;
128126
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
129127
pipenv run python choose_ci_set.py
130-
$selected_tests = Get-Content -Path .\selected_tests -Raw
131-
Set-Content -Path .\selected_tests -Value ("run" + "`r`n" + "pytest" + "`r`n" + $selected_tests)
132-
Start-Process pipenv -ArgumentList (Get-Content .\selected_tests) -wait -NoNewWindow
128+
pipenv run pytest $(cat selected_tests)
133129
$env:TEST_EXIT_CODE = $LASTEXITCODE
134130
rm artifacts/assets -r -Force
135131
Get-ChildItem -Path "artifacts" | ForEach-Object {

ci_pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ markers = [
1717
testpaths = [
1818
"tests"
1919
]
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"
20+
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"
2121

2222
[tool.ruff]
2323
target-version = "py310"

ci_xvfb_pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ markers = [
1717
testpaths = [
1818
"tests"
1919
]
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"
20+
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"
2121

2222
[tool.ruff]
2323
target-version = "py310"

0 commit comments

Comments
 (0)