Replace test decorator cvxoptonly with pytest mark cvxopt

Rory Yorke · Rory Yorke · commit eb2b492c2bf3 · 2025-10-18T14:14:27.000+02:00
The pytest marker cvxopt is equivalent to the cvxoptonly decorator,
and also allows cvxopt tests to be included or excluded at the pytest
command-line.
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -15,6 +15,11 @@ def pytest_runtest_setup(item):
                 for mark in item.iter_markers())):
         pytest.skip("slycot not installed")
 
+    if (not control.exception.cvxopt_check()
+        and any(mark.name == 'cvxopt'
+                for mark in item.iter_markers())):
+        pytest.skip("cvxopt not installed")
+
 
 @pytest.fixture(scope="session", autouse=True)
 def control_defaults():
diff --git a/control/tests/passivity_test.py b/control/tests/passivity_test.py
@@ -5,10 +5,9 @@
 import pytest
 import numpy
 from control import ss, passivity, tf, sample_system, parallel, feedback
-from control.tests.conftest import cvxoptonly
 from control.exception import ControlArgument, ControlDimension
 
-pytestmark = cvxoptonly
+pytestmark = pytest.mark.cvxopt
 
 
 def test_ispassive_ctime():
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,4 @@
 [pytest]
 markers =
   slycot: tests needing slycot
+  cvxopt: tests needing cvxopt
