From 8ace78ae61c10687fad4508dd73ada6a4f7cb005 Mon Sep 17 00:00:00 2001 From: pkdash Date: Tue, 29 Apr 2025 23:29:25 -0400 Subject: [PATCH 1/7] adding test run outputs to console --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1c36766..eada287 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ test-cov: .PHONY: test-cov-gh-action test-cov-gh-action: - docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear > pytest-coverage.txt + docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear 2>&1 | tee pytest-coverage.txt; exit ${PIPESTATUS[0]} .PHONY: default-env default-env: From 3401c35e06a4833c58da58e00b638cdc649b706f Mon Sep 17 00:00:00 2001 From: pkdash Date: Tue, 29 Apr 2025 23:44:12 -0400 Subject: [PATCH 2/7] making build fail if test fails --- .github/workflows/test_coverage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 90efcc3..5e6ffcc 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -36,9 +36,11 @@ jobs: shell: bash - name: Run Tests and Build Coverage + id: tests run: make test-cov-gh-action - name: Comment coverage + if: success() # Only run if tests passed uses: coroo/pytest-coverage-commentator@v1.0.2 with: pytest-coverage: pytest-coverage.txt From 770b2257dafaa1414d1274b7c96a93378ed66bf0 Mon Sep 17 00:00:00 2001 From: pkdash Date: Wed, 30 Apr 2025 09:48:02 -0400 Subject: [PATCH 3/7] making the build to fail when tests fail --- .github/workflows/test_coverage.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 5e6ffcc..462e296 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -36,11 +36,17 @@ jobs: shell: bash - name: Run Tests and Build Coverage - id: tests - run: make test-cov-gh-action + run: | + set -e + make test-cov-gh-action + exit_code=$? + if [ $exit_code -ne 0 ]; then + echo "Tests failed with exit code $exit_code" + exit $exit_code + fi - name: Comment coverage - if: success() # Only run if tests passed + if: success() uses: coroo/pytest-coverage-commentator@v1.0.2 with: pytest-coverage: pytest-coverage.txt From 21bf7852f14a8b063e3130b4fa36135c2ce93c87 Mon Sep 17 00:00:00 2001 From: pkdash Date: Wed, 30 Apr 2025 09:59:13 -0400 Subject: [PATCH 4/7] still trying to make the build fail when tests fail --- .github/workflows/test_coverage.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 462e296..418d774 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -35,15 +35,8 @@ jobs: run: sleep 10s shell: bash - - name: Run Tests and Build Coverage - run: | - set -e - make test-cov-gh-action - exit_code=$? - if [ $exit_code -ne 0 ]; then - echo "Tests failed with exit code $exit_code" - exit $exit_code - fi + - name: Run Tests + run: docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear - name: Comment coverage if: success() From 147ae2a9477669355dbda90b15fa0902e3027675 Mon Sep 17 00:00:00 2001 From: pkdash Date: Wed, 30 Apr 2025 10:20:16 -0400 Subject: [PATCH 5/7] fixing function call missing required parameter --- dspback/routers/external.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspback/routers/external.py b/dspback/routers/external.py index 471d0c7..1b598a6 100644 --- a/dspback/routers/external.py +++ b/dspback/routers/external.py @@ -50,7 +50,7 @@ async def create_metadata_repository(self, request: Request, metadata: request_m ) async def update_metadata(self, request: Request, metadata: request_model, identifier): metadata_json = json.loads(metadata.json()) - return await self.submit(request, identifier, self.wrap_metadata(metadata_json, False)) + return await self.submit(request, identifier, self.wrap_metadata(metadata=metadata_json, published=False, is_public=False)) @router.get( '/metadata/external/{identifier}', @@ -64,7 +64,7 @@ async def get_metadata_repository(self, identifier): submission = self.user.submission(identifier) metadata_json_str = submission.metadata_json metadata_json = json.loads(metadata_json_str) - return self.wrap_metadata(metadata_json, False) + return self.wrap_metadata(metadata=metadata_json, published=False, is_public=False) @router.delete( '/metadata/external/{identifier}', From 88f63292514c5d52964dda3be15961d7c70d3090 Mon Sep 17 00:00:00 2001 From: pkdash Date: Wed, 30 Apr 2025 10:27:06 -0400 Subject: [PATCH 6/7] fixing test coverage generation --- .github/workflows/test_coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 418d774..158ab07 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -36,7 +36,7 @@ jobs: shell: bash - name: Run Tests - run: docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear + run: docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear > pytest-coverage.txt 2>&1 - name: Comment coverage if: success() From b62063743872b34a7f513a9a08c7d5fa5690fd3e Mon Sep 17 00:00:00 2001 From: pkdash Date: Wed, 30 Apr 2025 10:57:56 -0400 Subject: [PATCH 7/7] show the test run ouputs in console --- .github/workflows/test_coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 158ab07..071cf1c 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -36,7 +36,7 @@ jobs: shell: bash - name: Run Tests - run: docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear > pytest-coverage.txt 2>&1 + run: docker exec dsp_dev_dspback pytest tests --cov=dspback --cache-clear 2>&1 | tee pytest-coverage.txt - name: Comment coverage if: success()