From 9b169d142c59245c17a113423ca30cafbecc7d05 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Thu, 16 Jan 2020 10:56:43 +0100
Subject: [PATCH] Fixed problem with importorskip in tests that import walberla
---
lbmpy_tests/test_serial_scenarios.py | 6 ++++--
lbmpy_tests/walberla_scenario_setup.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lbmpy_tests/test_serial_scenarios.py b/lbmpy_tests/test_serial_scenarios.py
index 62452b03..3c8ea283 100644
--- a/lbmpy_tests/test_serial_scenarios.py
+++ b/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)
diff --git a/lbmpy_tests/walberla_scenario_setup.py b/lbmpy_tests/walberla_scenario_setup.py
index 80b31118..0770884f 100644
--- a/lbmpy_tests/walberla_scenario_setup.py
+++ b/lbmpy_tests/walberla_scenario_setup.py
@@ -1,5 +1,5 @@
import pytest
-pytest.importorskip('waLBerla')
+pytest.importorskip('waLBerla.field')
import waLBerla.field as field
from waLBerla import createUniformBlockGrid, createUniformBufferedScheme, makeSlice
--
GitLab