diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77714a8ddf..900effbc26 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,7 +65,7 @@ jobs: if: steps.changed-files.outputs.only_changed == 'false' run: | nix profile install ./nix#go_1_22 - go tool covdata textfmt -i=integration_tests/coverage -o profile.txt + go tool covdata textfmt -i=coverage -o profile.txt - name: Upload coverage report if: steps.changed-files.outputs.only_changed == 'false' uses: codecov/codecov-action@v4 diff --git a/Makefile b/Makefile index aa76077427..2e2334289d 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ TESTS_TO_RUN ?= all run-integration-tests: @make gen-bindings-contracts - @nix-shell ./integration_tests/shell.nix --run ./scripts/run-integration-tests + @./scripts/run-integration-tests .PHONY: run-integration-tests diff --git a/integration_tests/pytest.ini b/integration_tests/pytest.ini index b8fee6fed3..bcc1429d41 100644 --- a/integration_tests/pytest.ini +++ b/integration_tests/pytest.ini @@ -1,2 +1,3 @@ [pytest] addopts = --ignore=contracts +python_files = integration_tests/*.py diff --git a/scripts/run-integration-tests b/scripts/run-integration-tests index 3dd4598e62..cd36cd13a7 100755 --- a/scripts/run-integration-tests +++ b/scripts/run-integration-tests @@ -9,7 +9,7 @@ echo "build test contracts" cd ../integration_tests/contracts HUSKY_SKIP_INSTALL=1 npm install npm run typechain -cd .. +cd ../.. TESTS_TO_RUN="${TESTS_TO_RUN:-all}" if [[ "$TESTS_TO_RUN" == "all" ]]; then echo "run all tests" @@ -18,4 +18,4 @@ else echo "run tests matching $TESTS_TO_RUN" cmd="pytest -vv -s --session-timeout=1800 --timeout=1800 -m '$TESTS_TO_RUN'" fi -nix-shell --run "$cmd" +nix-shell ./integration_tests/shell.nix --run "$cmd"