From 393d83be50bf8ddb3045854e4461fbc1587bfeac Mon Sep 17 00:00:00 2001 From: Jusong Yu Date: Fri, 22 Nov 2024 17:53:56 +0100 Subject: [PATCH 1/3] Not using verbose option for CI pytest --- .github/workflows/ci-code.yml | 2 +- .github/workflows/test-install.yml | 2 +- .github/workflows/tests_nightly.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-code.yml b/.github/workflows/ci-code.yml index ff95047bb4..b5f6aa424d 100644 --- a/.github/workflows/ci-code.yml +++ b/.github/workflows/ci-code.yml @@ -104,7 +104,7 @@ jobs: AIIDA_WARN_v3: 1 # Python 3.12 has a performance regression when running with code coverage # so run code coverage only for python 3.9. - run: pytest -v tests -m 'not nightly' ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }} + run: pytest tests -m 'not nightly' ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }} - name: Upload coverage report if: matrix.python-version == 3.9 && github.repository == 'aiidateam/aiida-core' diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 2f919a8c99..57ea0778c0 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -229,7 +229,7 @@ jobs: env: AIIDA_TEST_PROFILE: test_aiida AIIDA_WARN_v3: 1 - run: pytest --verbose tests -m 'not nightly' + run: pytest tests -m 'not nightly' - name: Freeze test environment run: pip freeze | sed '1d' | tee requirements-py-${{ matrix.python-version }}.txt diff --git a/.github/workflows/tests_nightly.sh b/.github/workflows/tests_nightly.sh index 10f26f7f15..dc02958a99 100755 --- a/.github/workflows/tests_nightly.sh +++ b/.github/workflows/tests_nightly.sh @@ -13,4 +13,4 @@ verdi -p test_aiida run ${SYSTEM_TESTS}/test_containerized_code.py bash ${SYSTEM_TESTS}/test_polish_workchains.sh verdi daemon stop -AIIDA_TEST_PROFILE=test_aiida pytest -v tests -m 'nightly' +AIIDA_TEST_PROFILE=test_aiida pytest tests -m 'nightly' From fdf3fd20d4020eaa8175fe52cad288ffe1e00a63 Mon Sep 17 00:00:00 2001 From: Julian Geiger Date: Mon, 25 Nov 2024 10:59:32 +0100 Subject: [PATCH 2/3] Remove remaining `pytest -v` to mirror changes of #6625. --- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c7ea8cb787..f88e4f8d72 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -145,7 +145,7 @@ jobs: id: tests env: AIIDA_WARN_v3: 0 - run: pytest -sv -m 'requires_rmq' + run: pytest -s -m 'requires_rmq' - name: Slack notification # Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80f7e35326..be1fbf7200 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,7 +85,7 @@ jobs: uses: ./.github/actions/install-aiida-core - name: Run sub-set of test suite - run: pytest -sv -k 'requires_rmq' + run: pytest -s -k 'requires_rmq' publish: From bb827a035ac474bcc888143a47a04eed4963f68e Mon Sep 17 00:00:00 2001 From: Jusong Yu Date: Mon, 25 Nov 2024 16:51:31 +0100 Subject: [PATCH 3/3] ff --- .github/workflows/tests_nightly.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_nightly.sh b/.github/workflows/tests_nightly.sh index ef7e0ced06..2712a5124e 100755 --- a/.github/workflows/tests_nightly.sh +++ b/.github/workflows/tests_nightly.sh @@ -13,4 +13,4 @@ verdi -p test_aiida run ${SYSTEM_TESTS}/test_containerized_code.py bash ${SYSTEM_TESTS}/test_polish_workchains.sh verdi daemon stop -AIIDA_TEST_PROFILE=test_aiida pytest --db-backend psql -m nightly tests/ \ No newline at end of file +AIIDA_TEST_PROFILE=test_aiida pytest --db-backend psql -m nightly tests/