Skip to content

Commit 91348dd

Browse files
Merge branch 'master' into add-tags-to-rut
2 parents d123058 + 7d52bf7 commit 91348dd

27 files changed

+61
-0
lines changed

β€Ž.github/workflows/ci-testing-deploy.ymlβ€Ž

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,51 @@ jobs:
450450
with:
451451
token: ${{ secrets.CODECOV_TOKEN }}
452452

453+
unit-test-webserver-04:
454+
needs: changes
455+
if: ${{ needs.changes.outputs.webserver == 'true' || github.event_name == 'push' }}
456+
timeout-minutes: 25 # if this timeout gets too small, then split the tests
457+
name: "[unit] webserver 04"
458+
runs-on: ${{ matrix.os }}
459+
strategy:
460+
matrix:
461+
python: ["3.11"]
462+
os: [ubuntu-22.04]
463+
fail-fast: false
464+
steps:
465+
- uses: actions/checkout@v4
466+
- name: setup docker buildx
467+
id: buildx
468+
uses: docker/setup-buildx-action@v3
469+
with:
470+
driver: docker-container
471+
- name: setup python environment
472+
uses: actions/setup-python@v5
473+
with:
474+
python-version: ${{ matrix.python }}
475+
- name: install uv
476+
uses: astral-sh/setup-uv@v3
477+
with:
478+
version: "0.4.x"
479+
enable-cache: false
480+
cache-dependency-glob: "**/web/server/requirements/ci.txt"
481+
- name: show system version
482+
run: ./ci/helpers/show_system_versions.bash
483+
- name: install webserver
484+
run: ./ci/github/unit-testing/webserver.bash install
485+
- name: test
486+
run: ./ci/github/unit-testing/webserver.bash test_with_db 04
487+
- uses: codecov/[email protected]
488+
env:
489+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
490+
with:
491+
flags: unittests #optional
492+
- name: Upload test results to Codecov
493+
if: ${{ !cancelled() }}
494+
uses: codecov/test-results-action@v1
495+
with:
496+
token: ${{ secrets.CODECOV_TOKEN }}
497+
453498
unit-test-storage:
454499
needs: changes
455500
if: ${{ needs.changes.outputs.storage == 'true' || github.event_name == 'push' }}
@@ -1875,6 +1920,7 @@ jobs:
18751920
unit-test-webserver-01,
18761921
unit-test-webserver-02,
18771922
unit-test-webserver-03,
1923+
unit-test-webserver-04,
18781924
]
18791925
runs-on: ubuntu-latest
18801926
steps:
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# pylint: disable=redefined-outer-name
2+
# pylint: disable=unused-argument
3+
# pylint: disable=unused-variable
4+
5+
6+
import pytest
7+
8+
9+
@pytest.fixture
10+
def app_environment(
11+
app_environment: dict[str, str], monkeypatch: pytest.MonkeyPatch
12+
) -> dict[str, str]:
13+
# NOTE: overrides app_environment
14+
monkeypatch.setenv("WEBSERVER_GARBAGE_COLLECTOR", "null")
15+
return app_environment | {"WEBSERVER_GARBAGE_COLLECTOR": "null"}

0 commit comments

Comments
Β (0)