Merge remote-tracking branch 'origin/main'

pyiron · Nov 10, 2023 · 694c75f · 694c75f
2 parents bcd2559 + fccaff8
commit 694c75f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml
@@ -47,13 +47,7 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
-      run: >
-        for f in $(ls tests/test_*.py); do
-          echo $f;
-          if [ $f != "tests/test_flux.py" ]; then
-            coverage run --omit pympipool/_version.py -m unittest $f;
-          fi
-        done
+      run: cd tests; coverage run --omit pympipool/_version.py -m unittest discover .
       env:
         OMPI_MCA_plm: 'isolated'
         OMPI_MCA_rmaps_base_oversubscribe: 'yes'

diff --git a/tests/test_flux.py b/tests/test_flux.py
@@ -1,4 +1,5 @@
 from concurrent.futures import Future
+import os
 from queue import Queue
 
 import numpy as np
@@ -15,7 +16,7 @@
         FluxPythonInterface,
     )
 
-    skip_flux_test = False
+    skip_flux_test = "FLUX_URI" not in os.environ
 except ImportError:
     skip_flux_test = True