fixups, I think

firedrakeproject · Jan 13, 2025 · 1eab6a8 · 1eab6a8
1 parent ebda6c0
commit 1eab6a8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/.github/actions/test_firedrake/action.yml b/.github/actions/test_firedrake/action.yml
@@ -10,15 +10,33 @@ runs:
   steps:
     - name: Run tests (nprocs = ${{ inputs.nprocs }})
       shell: bash
+      if: ${{ inputs.nprocs == 1 }}
       run: |
         . ../firedrake_venv/bin/activate
-        mpispawn -nU 12 -nW ${{ inputs.nprocs }} --propagate-errcodes pytest \
+        mpispawn -nU 12 -nW ${{ inputs.nprocs }} --propagate-errcodes \
+          pytest \
           --splitting-algorithm least_duration \
           --splits \$MPISPAWN_NUM_TASKS \
           --group \$MPISPAWN_TASK_ID1 \
           --timeout=1800 \
           --timeout-method=thread \
           -o faulthandler_timeout=1860 \
           --junit-xml=firedrake${{ inputs.nprocs }}_\$MPISPAWN_TASK_ID1.xml \
-          -m "parallel[\$MPISPAWN_WORLD_SIZE] and not broken" \
+          -m "parallel[\$MPISPAWN_WORLD_SIZE] or not parallel" \
+          -v tests/firedrake
+    - name: Run tests (nprocs = ${{ inputs.nprocs }})
+      shell: bash
+      if: ${{ inputs.nprocs > 1 }}
+      run: |
+        . ../firedrake_venv/bin/activate
+        mpispawn -nU 12 -nW ${{ inputs.nprocs }} --propagate-errcodes \
+          pytest \
+          --splitting-algorithm least_duration \
+          --splits \$MPISPAWN_NUM_TASKS \
+          --group \$MPISPAWN_TASK_ID1 \
+          --timeout=1800 \
+          --timeout-method=thread \
+          -o faulthandler_timeout=1860 \
+          --junit-xml=firedrake${{ inputs.nprocs }}_\$MPISPAWN_TASK_ID1.xml \
+          -m parallel[\$MPISPAWN_WORLD_SIZE] \
           -v tests/firedrake
diff --git a/tests/firedrake/regression/test_stress_elements.py b/tests/firedrake/regression/test_stress_elements.py
@@ -29,7 +29,6 @@ def mesh_hierarchy(request):
     return mh
 
 
-@pytest.mark.markif_fixture(pytest.mark.slow, stress_element="conforming")
 def test_stress_displacement_convergence(stress_element, mesh_hierarchy):
     mesh = mesh_hierarchy[0]
     V = FunctionSpace(mesh, mesh.coordinates.ufl_element())