use setup conftest

schrodinger · Jun 11, 2024 · 759fb14 · 759fb14
1 parent e84712f
commit 759fb14
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/testing/testing.py b/testing/testing.py
@@ -695,7 +695,6 @@ def run_testfiles(filenames='all', verbosity=2, out=sys.stderr, **kwargs):
                                                  resultclass=PyMOLTestResult, verbosity=int(verbosity)).run(suite)
 
         # Run pytest files if any
-        cmd.reinitialize()
         pytest_nfail = pytest.main(['-v', *map(str, pytest_files)]) if pytest_files else 0
 
         while deferred_unlink:

diff --git a/testing/tests/api/conftest.py b/testing/tests/api/conftest.py
@@ -0,0 +1,9 @@
+import pytest
+
+from pymol import cmd
+
+
+@pytest.fixture(autouse=True)
+def setup():
+    cmd.reinitialize()
+    yield