From 96a3c94163eaad73a5d9d43781b37b44f6fd971f Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Mon, 9 Sep 2024 22:13:46 +0100 Subject: [PATCH 1/9] Display results of pytest outcome --- .github/workflows/build.yml | 6 ++++++ setup.cfg | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f61ab2d9b..cd8aae83a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,8 +102,14 @@ jobs: --timeout-method=thread \ -o faulthandler_timeout=1860 \ -n 12 --dist worksteal \ + --junit-xml=firedrake.xml \ -sv tests timeout-minutes: 120 + - name: Publish Test Report + uses: mikepenz/action-junit-report@v4 + if: success() || failure() # always run even if the previous step fails + with: + report_paths: '/__w/firedrake/firedrake/firedrake.xml' - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} run: | diff --git a/setup.cfg b/setup.cfg index 5a83e55bee..d9fa8e08a3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,3 +20,5 @@ exclude = .git,__pycache__,build,.tox,dist,firedrake/_version.py [tool:pytest] xfail_strict = true +junit_suite_name = firedrake +junit_duration_report = call From a4c12efb3ddf7d05bcdf45a19a06df31e18e69bc Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Tue, 10 Sep 2024 17:43:25 +0100 Subject: [PATCH 2/9] Write a message on the PR --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd8aae83a9..466720fcbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,9 +107,10 @@ jobs: timeout-minutes: 120 - name: Publish Test Report uses: mikepenz/action-junit-report@v4 - if: success() || failure() # always run even if the previous step fails + if: ${{ always() }} with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' + comment: true - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} run: | From 34142d6c069440b184a506ca48f8426e001b7534 Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Tue, 10 Sep 2024 17:43:50 +0100 Subject: [PATCH 3/9] REVERT ME: deliberately fail a test --- tests/regression/test_cellvolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/test_cellvolume.py b/tests/regression/test_cellvolume.py index 4d60adddfa..6c3b24168a 100644 --- a/tests/regression/test_cellvolume.py +++ b/tests/regression/test_cellvolume.py @@ -44,7 +44,7 @@ def test_facet_area(cell, mesh): "triangle": 4.0, "quadrilateral": 4.0, "tetrahedron": 1.5}[cell] - assert np.allclose(assemble(FacetArea(mesh)*ds), expect) + assert np.allclose(assemble(FacetArea(mesh)*ds), 2*expect) def test_miscellaneous(): From e53590cce24da93350597623e4e74a215c6f9043 Mon Sep 17 00:00:00 2001 From: Jack Betteridge <43041811+JDBetteridge@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:00:41 +0100 Subject: [PATCH 4/9] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 466720fcbe..2dffc4c51d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: -sv tests timeout-minutes: 120 - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: ${{ always() }} with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' From 1aee66c48653ca46e14bd8310617c4bb674e1a72 Mon Sep 17 00:00:00 2001 From: Jack Betteridge <43041811+JDBetteridge@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:35:03 +0100 Subject: [PATCH 5/9] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dffc4c51d..1397af1407 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: -sv tests timeout-minutes: 120 - name: Publish Test Report - uses: mikepenz/action-junit-report@v5 + uses: mikepenz/action-junit-report@v5.0.0-a02 if: ${{ always() }} with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' From fc94236d6826e9f669f420875a597cf59abcb48f Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Wed, 11 Sep 2024 11:34:43 +0100 Subject: [PATCH 6/9] More flags --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1397af1407..bb0dd2e927 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,6 +111,9 @@ jobs: with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' comment: true + check_name: 'Firedrake' + job_name: ${{ matrix.scalar-type }} + flaky_summary: true - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} run: | From a76501c87aa5970235cd1c38556cc2c40662b4d1 Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Wed, 11 Sep 2024 13:45:56 +0100 Subject: [PATCH 7/9] fiddling --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb0dd2e927..39c191712e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,8 +111,8 @@ jobs: with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' comment: true - check_name: 'Firedrake' - job_name: ${{ matrix.scalar-type }} + check_name: 'Firedrake' ${{ matrix.scalar-type }} + updateComment: true flaky_summary: true - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} From 58d6ff3660c4190acda214f1dfc40d6222c4aa02 Mon Sep 17 00:00:00 2001 From: Jack Betteridge Date: Wed, 11 Sep 2024 13:53:19 +0100 Subject: [PATCH 8/9] fiddling --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39c191712e..27bc44fc2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: with: report_paths: '/__w/firedrake/firedrake/firedrake.xml' comment: true - check_name: 'Firedrake' ${{ matrix.scalar-type }} + check_name: "Firedrake ${{ matrix.scalar-type }}" updateComment: true flaky_summary: true - name: Test pyadjoint From beffb66f61195dcd8cdc21c39f008958337cddd0 Mon Sep 17 00:00:00 2001 From: "David A. Ham" Date: Wed, 11 Sep 2024 16:52:00 +0100 Subject: [PATCH 9/9] Update tests/regression/test_cellvolume.py --- tests/regression/test_cellvolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/test_cellvolume.py b/tests/regression/test_cellvolume.py index 6c3b24168a..4d60adddfa 100644 --- a/tests/regression/test_cellvolume.py +++ b/tests/regression/test_cellvolume.py @@ -44,7 +44,7 @@ def test_facet_area(cell, mesh): "triangle": 4.0, "quadrilateral": 4.0, "tetrahedron": 1.5}[cell] - assert np.allclose(assemble(FacetArea(mesh)*ds), 2*expect) + assert np.allclose(assemble(FacetArea(mesh)*ds), expect) def test_miscellaneous():