remove pytest --skipslow; use pytest -m "not slow" instead

murrayrm · murrayrm · commit 039b22d29031 · 2023-03-23T21:55:40.000-07:00
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -121,25 +121,6 @@ def mplcleanup():
         mpl.pyplot.close("all")
 
 
-#
-# Functionality to skip slow tests using --skipslow
-#
-# See https://docs.pytest.org/en/latest/example/simple.html
-#   #control-skipping-of-tests-according-to-command-line-option
-#
-def pytest_addoption(parser):
-    parser.addoption(
-        "--skipslow", action="store_true", default=False,
-        help="skip slow tests")
-
-
+# Allow pytest.mark.slow to mark slow tests (skip with pytest -m "not slow")
 def pytest_configure(config):
     config.addinivalue_line("markers", "slow: mark test as slow to run")
-
-
-def pytest_collection_modifyitems(config, items):
-    if config.getoption("--skipslow"):
-        skip_slow = pytest.mark.skip(reason="skipping slow tests")
-        for item in items:
-            if "slow" in item.keywords:
-                item.add_marker(skip_slow)
