From 67cc4b0c4763d9ce026b989e728d7783f19f1603 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Wed, 3 Aug 2022 14:27:28 +0200
Subject: [PATCH] revert main conftest
---
tests/conftest.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index 38abd0a98..3c34eb25f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -86,10 +86,11 @@ def pytest_runtest_setup(item):
):
pytest.skip("gpfs not available")
- if list(item.iter_markers(name="requires_caldb")) and not server_reachable(): # noqa
+ if list(item.iter_markers(name="requires_caldb")) and not server_reachable():
pytest.skip("caldb not available")
- if (list(item.iter_markers(name="requires_mdc")) and
+ if (
+ list(item.iter_markers(name="requires_mdc")) and
item.config.getoption("--no-mdc")
):
pytest.skip("myMDC not available")
--
GitLab