test_ssl.py: make ssl testing possible with "--ssl" option to pytest

csernazs · csernazs · commit e9a3a9dfe755 · 2021-02-14T18:47:54.000+01:00
Run ssl tests only when '--ssl' is specified. This enables the session scope
level 'httpserver_ssl_context' which could affect other tests and as it is
session based, it needs to be run in a separate test run from the other
tests.
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ clean: cov-clean doc-clean
 .PHONY: quick-test
 quick-test:
 	.venv/bin/pytest tests -s -vv
+	.venv/bin/pytest tests -s -vv --ssl
 
 .PHONY: test
 test:
@@ -43,6 +44,7 @@ test-pdb:
 .PHONY: cov
 cov: cov-clean
 	.venv/bin/coverage run -m pytest -vv tests
+	.venv/bin/coverage run -a -m pytest -vv tests --ssl
 	.venv/bin/coverage xml
 
 .PHONY: cov-clean
diff --git a/setup.cfg b/setup.cfg
@@ -3,3 +3,7 @@ test=pytest
 
 [flake8]
 max-line-length = 145
+
+[tool:pytest]
+markers =
+    ssl: set up ssl context
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,14 @@
+
+import pytest
+
+
+def pytest_addoption(parser):
+    parser.addoption("--ssl", action="store_true", default=False, help="run ssl tests")
+
+
+def pytest_runtest_setup(item):
+    markers = [marker.name for marker in item.iter_markers()]
+    if not item.config.getoption("--ssl") and "ssl" in markers:
+        pytest.skip()
+    if item.config.getoption("--ssl") and "ssl" not in markers:
+        pytest.skip()
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
@@ -4,6 +4,7 @@
 
 import pytest
 import requests
+pytestmark = pytest.mark.ssl
 
 test_dir = os.path.dirname(os.path.realpath(__file__))
 assets_dir = pjoin(test_dir, "assets")
diff --git a/tox.ini b/tox.ini
@@ -5,11 +5,13 @@ envlist =
     py36
     py36-env
     py37
+    py38
 
 [testenv]
 commands =
     pip install -e .[test]
-    pytest
+    pytest -vv
+    pytest -vv --ssl
 
 
 [testenv:py36-env]
