metacov tweaks

Author: nedbat

igor.py

@@ -209,7 +209,6 @@ def run_tests_with_coverage(core, *runner_args):
     import coverage
 
     cov = coverage.Coverage(config_file="metacov.ini")
-    cov.set_option("run:core", "ctrace")
     cov._warn_unimported_source = False
     cov._warn_preimported_source = False
     cov._metacov = True

metacov.ini

@@ -77,6 +77,9 @@ exclude_lines =
     # Lines that will never be called, but satisfy the type checker
     pragma: never called
 
+    # Code that is never run during metacov, but run during normal tests.
+    pragma: never metacov
+
 partial_branches =
     pragma: part covered
     # A for-loop that always hits its break statement

tests/conftest.py

@@ -111,7 +111,11 @@ def pytest_runtest_call() -> Iterable[None]:
     """Check the exception raised by the test, and skip the test if needed."""
     try:
         yield
-    except Exception as e:
+    except Exception as e:  # pragma: never metacov
+        # This code is for dealing with the exception raised when we are
+        # measuring with a core that doesn't support branch measurement.
+        # During metacov, we skip those situations entirely by not running
+        # sysmon on 3.12 or 3.13, so this code is never needed during metacov.
         if getattr(e, "skip_tests", False):
             pytest.skip(f"Skipping for exception: {e}")
         else:

tests/test_concurrency.py

@@ -363,14 +363,10 @@ def gwork(q):
             assert "Couldn't trace with concurrency=gevent, the module isn't installed.\n" in out
             pytest.skip("Can't run test without gevent installed.")
         if not testenv.C_TRACER:
-            if testenv.PY_TRACER:
-                assert out == (
-                    "Can't support concurrency=gevent with PyTracer, only threads are supported.\n"
-                )
-            else:
-                assert out == (
-                    "Can't use core=sysmon: sys.monitoring doesn't support concurrency=gevent\n"
-                )
+            assert testenv.PY_TRACER
+            assert out == (
+                "Can't support concurrency=gevent with PyTracer, only threads are supported.\n"
+            )
             pytest.skip(f"Can't run gevent with {testenv.REQUESTED_TRACER_CLASS}.")
 
         assert out == "done\n"