diff --git a/.github/integration-test.py b/.github/integration-test.py index b3fa090..b6fd9e9 100755 --- a/.github/integration-test.py +++ b/.github/integration-test.py @@ -187,10 +187,7 @@ def run_test( run_container_command( test_name, - # We abort pytest after two failures as a compromise between wanting to - # avoid a flood of logs while still understanding if multiple tests - # would fail. - "/opt/tljh/hub/bin/python3 -m pytest --verbose --maxfail=2 --color=yes --durations=10 --capture=no {}".format( + "/opt/tljh/hub/bin/python3 -m pytest --capture=no {}".format( " ".join( [os.path.join("/srv/src/integration-tests/", f) for f in test_files] ) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 1b7939e..e445347 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -59,16 +59,12 @@ jobs: with: python-version: "3.10" - - name: Install pytest - run: python3 -m pip install pytest + - name: Install integration-tests/requirements.txt + run: pip install -r integration-tests/requirements.txt - # We abort pytest after two failures as a compromise between wanting to - # avoid a flood of logs while still understanding if multiple tests would - # fail. - name: Run bootstrap tests (Runs in/Builds ${{ matrix.distro_image }} derived image) run: | - pytest --verbose --maxfail=2 --color=yes --durations=10 --capture=no \ - integration-tests/test_bootstrap.py + pytest --capture=no integration-tests/test_bootstrap.py timeout-minutes: 20 env: # integration-tests/test_bootstrap.py will build and start containers diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 96b22bd..ea7e1e2 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -82,15 +82,15 @@ jobs: - name: Install Python dependencies run: | - python3 -m pip install -r dev-requirements.txt - python3 -m pip install -e . + pip install -r dev-requirements.txt + pip install -e . + + - name: List Python dependencies + run: | pip freeze - # We abort pytest after two failures as a compromise between wanting to - # avoid a flood of logs while still understanding if multiple tests would - # fail. - name: Run unit tests - run: pytest --verbose --maxfail=2 --color=yes --durations=10 --cov=tljh tests/ + run: pytest tests timeout-minutes: 15 - uses: codecov/codecov-action@v3