Fixed problem with importorskip in tests that import walberla

lbmpy_tests/test_serial_scenarios.py

@@ -133,8 +133,9 @@ def compare_lid_driven_cavity(optimization=MappingProxyType({}), action='Testing
         name = name + "_incompressible"
 
     try:
+        import waLBerla.field
         from lbmpy_tests.walberla_scenario_setup import create_lid_driven_cavity as run_lid_driven_cavity_walberla
-    except Exception:
+    except ImportError:
         run_lid_driven_cavity_walberla = None
 
     return compare_scenario(run_ldc_lbmpy, run_lid_driven_cavity_walberla, optimization, action, name, plot, **kwargs)
@@ -151,8 +152,9 @@ def compare_force_driven_channel(optimization=MappingProxyType({}), action='Test
         name = name + "_incompressible"
 
     try:
+        import waLBerla.field
         from lbmpy_tests.walberla_scenario_setup import create_lid_driven_cavity as run_force_driven_channel_walberla
-    except Exception:
+    except ImportError:
         run_force_driven_channel_walberla = None
 
     return compare_scenario(lbmpy_func, run_force_driven_channel_walberla, optimization, action, name, plot, **kwargs)

lbmpy_tests/walberla_scenario_setup.py

 import pytest
-pytest.importorskip('waLBerla')
+pytest.importorskip('waLBerla.field')
 
 import waLBerla.field as field
 from waLBerla import createUniformBlockGrid, createUniformBufferedScheme, makeSlice