Merge branch 'main' into debt/remove-easy-installdebt/remove-easy-install

1 files changed, 22 insertions, 0 deletions

diff --git a/conftest.py b/conftest.py
index d5e851fe..2271ec3e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,5 +1,7 @@
 import sys
 
+import pytest
+
 
 pytest_plugins = 'setuptools.tests.fixtures'
 
@@ -9,6 +11,15 @@ def pytest_addoption(parser):
         "--package_name", action="append", default=[],
         help="list of package_name to pass to test functions",
     )
+    parser.addoption(
+        "--integration", action="store_true", default=False,
+        help="run integration tests (only)"
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line("markers", "integration: integration tests")
+    config.addinivalue_line("markers", "uses_network: tests may try to download files")
 
 
 collect_ignore = [
@@ -21,9 +32,20 @@ collect_ignore = [
     'pkg_resources/tests/data',
     'setuptools/_vendor',
     'pkg_resources/_vendor',
+    'setuptools/config/_validate_pyproject',
 ]
 
 
 if sys.version_info < (3, 6):
     collect_ignore.append('docs/conf.py')  # uses f-strings
     collect_ignore.append('pavement.py')
+
+
+@pytest.fixture(autouse=True)
+def _skip_integration(request):
+    running_integration_tests = request.config.getoption("--integration")
+    is_integration_test = request.node.get_closest_marker("integration")
+    if running_integration_tests and not is_integration_test:
+        pytest.skip("running integration tests only")
+    if not running_integration_tests and is_integration_test:
+        pytest.skip("skipping integration tests")