test: adjust tests for the sysmon core

Author: nedbat

tests/test_cmdline.py

@@ -1008,7 +1008,7 @@ def test_version(self) -> None:
         self.command_line("--version")
         out = self.stdout()
         assert "ersion " in out
-        if testenv.C_TRACER:
+        if testenv.C_TRACER or testenv.SYS_MON:
             assert "with C extension" in out
         else:
             assert "without C extension" in out

tests/test_concurrency.py

@@ -607,6 +607,7 @@ def test_bug_890(self) -> None:
         assert out.splitlines()[-1] == "ok"
 
 
+@pytest.mark.skipif(not testenv.SETTRACE_CORE, reason="gettrace is not supported with this core.")
 def test_coverage_stop_in_threads() -> None:
     has_started_coverage = []
     has_stopped_coverage = []

tests/test_context.py

@@ -11,11 +11,14 @@
 from typing import Any, List, Optional, Tuple
 from unittest import mock
 
+import pytest
+
 import coverage
 from coverage.context import qualname_from_frame
 from coverage.data import CoverageData, sorted_lines
 from coverage.types import TArc, TCovKwargs, TLineNo
 
+from tests import testenv
 from tests.coveragetest import CoverageTest
 from tests.helpers import assert_count_equal
 
@@ -124,6 +127,7 @@ def assert_combined_arcs(filename: str, context: str, lines: List[TArc]) -> None
             assert_combined_arcs(fblue, 'blue', self.ARCS)
 
 
+@pytest.mark.skipif(not testenv.DYN_CONTEXTS, reason="No dynamic contexts with this core")
 class DynamicContextTest(CoverageTest):
     """Tests of dynamically changing contexts."""
 

tests/test_debug.py

@@ -197,7 +197,7 @@ def test_debug_sys(self) -> None:
     def test_debug_sys_ctracer(self) -> None:
         out_text = self.f1_debug_output(["sys"])
         tracer_line = re_line(r"CTracer:", out_text).strip()
-        if testenv.C_TRACER:
+        if testenv.C_TRACER or testenv.SYS_MON:
             expected = "CTracer: available"
         else:
             expected = "CTracer: unavailable"

tests/test_html.py

@@ -27,6 +27,7 @@
 from coverage.report_core import get_analysis_to_report
 from coverage.types import TLineNo, TMorf
 
+from tests import testenv
 from tests.coveragetest import CoverageTest, TESTS_DIR
 from tests.goldtest import gold_path
 from tests.goldtest import compare, contains, contains_rx, doesnt_contain, contains_any
@@ -1135,6 +1136,7 @@ def test_accented_directory(self) -> None:
         assert expected % os.sep in index
 
 
+@pytest.mark.skipif(not testenv.DYN_CONTEXTS, reason="No dynamic contexts with this core.")
 class HtmlWithContextsTest(HtmlTestHelpers, CoverageTest):
     """Tests of the HTML reports with shown contexts."""
 

tests/test_oddball.py

@@ -474,21 +474,25 @@ def swap_it():
 
     def test_setting_new_trace_function(self) -> None:
         # https://github.com/nedbat/coveragepy/issues/436
+        if testenv.SETTRACE_CORE:
+            missing = "5-7, 13-14"
+        else:
+            missing = "5-7"
         self.check_coverage('''\
             import os.path
             import sys
 
             def tracer(frame, event, arg):
-                filename = os.path.basename(frame.f_code.co_filename)
-                print(f"{event}: {filename} @ {frame.f_lineno}")
-                return tracer
+                filename = os.path.basename(frame.f_code.co_filename)   # 5
+                print(f"{event}: {filename} @ {frame.f_lineno}")        # 6
+                return tracer                                           # 7
 
             def begin():
                 sys.settrace(tracer)
 
             def collect():
-                t = sys.gettrace()
-                assert t is tracer, t
+                t = sys.gettrace()              # 13
+                assert t is tracer, t           # 14
 
             def test_unsets_trace() -> None:
                 begin()
@@ -501,7 +505,7 @@ def test_unsets_trace() -> None:
             b = 22
             ''',
             lines=[1, 2, 4, 5, 6, 7, 9, 10, 12, 13, 14, 16, 17, 18, 20, 21, 22, 23, 24],
-            missing="5-7, 13-14",
+            missing=missing,
         )
 
         assert self.last_module_name is not None

tests/test_plugins.py

@@ -207,7 +207,7 @@ def coverage_init(reg, options):
         cov._debug_file = debug_out
         cov.set_option("run:plugins", ["plugin_sys_info"])
         with swallow_warnings(
-            r"Plugin file tracers \(plugin_sys_info.Plugin\) aren't supported with PyTracer"
+            r"Plugin file tracers \(plugin_sys_info.Plugin\) aren't supported with .*"
         ):
             cov.start()
         cov.stop()      # pragma: nested
@@ -273,23 +273,28 @@ def coverage_init(reg, options):
         assert out == ""
 
 
-@pytest.mark.skipif(testenv.C_TRACER, reason="This test is only about PyTracer.")
+@pytest.mark.skipif(testenv.PLUGINS, reason="This core doesn't support plugins.")
 class PluginWarningOnPyTracerTest(CoverageTest):
-    """Test that we get a controlled exception with plugins on PyTracer."""
+    """Test that we get a controlled exception when plugins aren't supported."""
     def test_exception_if_plugins_on_pytracer(self) -> None:
         self.make_file("simple.py", "a = 1")
 
         cov = coverage.Coverage()
         cov.set_option("run:plugins", ["tests.plugin1"])
 
+        if testenv.PY_TRACER:
+            core = "PyTracer"
+        elif testenv.SYS_MON:
+            core = "Pep669Tracer"
+
         expected_warnings = [
-            r"Plugin file tracers \(tests.plugin1.Plugin\) aren't supported with PyTracer",
+            fr"Plugin file tracers \(tests.plugin1.Plugin\) aren't supported with {core}",
         ]
         with self.assert_warnings(cov, expected_warnings):
             self.start_import_stop(cov, "simple")
 
 
-@pytest.mark.skipif(not testenv.C_TRACER, reason="Plugins are only supported with the C tracer.")
+@pytest.mark.skipif(not testenv.PLUGINS, reason="Plugins are not supported with this core.")
 class FileTracerTest(CoverageTest):
     """Tests of plugins that implement file_tracer."""
 
@@ -962,6 +967,7 @@ def test_configurer_plugin(self) -> None:
         assert "pragma: or whatever" in excluded
 
 
+@pytest.mark.skipif(not testenv.DYN_CONTEXTS, reason="No dynamic contexts with this core")
 class DynamicContextPluginTest(CoverageTest):
     """Tests of plugins that implement `dynamic_context`."""
 

tests/test_process.py

@@ -539,6 +539,8 @@ def test_timid(self) -> None:
             # If the C trace function is being tested, then regular running should have
             # the C function, which registers itself as f_trace.
             assert cov_out == "CTracer\n"
+        elif testenv.SYS_MON:
+            assert cov_out == "None\n"
         else:
             # If the Python trace function is being tested, then regular running will
             # also show the Python function.

tests/test_venv.py

@@ -283,7 +283,7 @@ def test_venv_isnt_measured(self, coverage_command: str) -> None:
         assert "coverage" not in out
         assert "colorsys" not in out
 
-    @pytest.mark.skipif(not testenv.C_TRACER, reason="Plugins are only supported with the C tracer.")
+    @pytest.mark.skipif(not testenv.C_TRACER, reason="No plugins with this core.")
     def test_venv_with_dynamic_plugin(self, coverage_command: str) -> None:
         # https://github.com/nedbat/coveragepy/issues/1150
         # Django coverage plugin was incorrectly getting warnings:

tests/testenv.py

@@ -9,3 +9,18 @@
 
 # Are we testing the C-implemented trace function?
 C_TRACER = os.getenv("COVERAGE_CORE", "ctrace") == "ctrace"
+
+# Are we testing the Python-implemented trace function?
+PY_TRACER = os.getenv("COVERAGE_CORE", "ctrace") == "pytrace"
+
+# Are we testing the sys.monitoring implementation?
+SYS_MON = os.getenv("COVERAGE_CORE", "ctrace") == "sysmon"
+
+# Are we using a settrace function as a core?
+SETTRACE_CORE = C_TRACER or PY_TRACER
+
+# Are plugins supported during these tests?
+PLUGINS = C_TRACER
+
+# Are dynamic contexts supported during these tests?
+DYN_CONTEXTS = C_TRACER or PY_TRACER