pytest-testmon 2.2.0__tar.gz → 2.3.0b0__tar.gz

{pytest_testmon-2.2.0/pytest_testmon.egg-info → pytest_testmon-2.3.0b0}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: pytest-testmon
-Version: 2.2.0
+Version: 2.3.0b0
 Summary: selects tests affected by changed files and methods
 Author-email: Tibor Arpas <tibor@testmon.org>
 License: MIT
+Project-URL: Homepage, https://testmon.org
+Project-URL: Source, https://github.com/tarpas/pytest-testmon
 Keywords: testing,pytest,plugin
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,7 +17,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pytest
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest<10,>=5

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/pyproject.toml

@@ -7,11 +7,11 @@ name = "pytest-testmon"
 authors = [
     { name = "Tibor Arpas", email = "tibor@testmon.org" },
 ]
-dynamic =  ["version"]
+dynamic = ["version"]
 
 description = "selects tests affected by changed files and methods"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = ["testing", "pytest", "plugin"]
 license = { text = "MIT" }
 classifiers = [
@@ -31,34 +31,28 @@ dependencies = [
     "coverage>=6,<8",
 ]
 
-# specify testmon and tmserver as packages of this project
+[project.urls]
+Homepage = "https://testmon.org"
+Source = "https://github.com/tarpas/pytest-testmon"
+
+[project.entry-points.pytest11]
+pytest-testmon = "testmon.pytest_testmon"
+
 [tool.setuptools]
-packages = [
-    "testmon",
-]
+packages = ["testmon"]
 
 [tool.setuptools.dynamic]
 version = {attr = "testmon.TESTMON_VERSION"}
 
-[tool.black]
-exclude = '''
-(
-  /(
-      \.eggs         # exclude a few common directories in the
-    | \.git          # root of the project
-    | \.hg
-    | \.mypy_cache
-    | \.tox
-    | \.venv
-    | _build
-    | buck-out
-    | build
-    | dist
-  )/
-  | io.intellij/
-)
-'''
-
-
-[project.entry-points.pytest11]
-pytest-testmon = "testmon.pytest_testmon"
+# Development dependencies, managed by uv: `uv sync` then `uv run pytest` / `uv run tox`.
+[dependency-groups]
+dev = [
+    "pytest==8.3.5",
+    "pytest-cov",
+    "pytest-xdist",
+    "pytest-mock",
+    "ruff",
+    "tox",
+    "tox-gh-actions",
+    "pre-commit",
+]

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0/pytest_testmon.egg-info}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: pytest-testmon
-Version: 2.2.0
+Version: 2.3.0b0
 Summary: selects tests affected by changed files and methods
 Author-email: Tibor Arpas <tibor@testmon.org>
 License: MIT
+Project-URL: Homepage, https://testmon.org
+Project-URL: Source, https://github.com/tarpas/pytest-testmon
 Keywords: testing,pytest,plugin
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,7 +17,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pytest
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest<10,>=5

pytest_testmon-2.3.0b0/testmon/__init__.py

@@ -0,0 +1,3 @@
+"""PYTEST_DONT_REWRITE"""
+
+TESTMON_VERSION = "2.3.0b0"

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/testmon/configure.py

@@ -75,7 +75,8 @@ def _get_noselect_reasons(options):
     if options["markexpr"]:
         return ["-m was used"]
 
-    if options["lf"]:
+    # `--lf` is registered by the cacheprovider plugin, absent with `-p no:cacheprovider`
+    if options.get("lf"):
         return ["--lf was used"]
 
     file_or_dir = options.get("file_or_dir") or []

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/testmon/db.py

@@ -5,10 +5,8 @@ import sqlite3
 from collections import namedtuple
 from functools import lru_cache
 
-from testmon.process_code import blob_to_checksums, checksums_to_blob
-
 from testmon.common import TestExecutions
-
+from testmon.process_code import blob_to_checksums, checksums_to_blob
 
 DATA_VERSION = 14
 
@@ -81,12 +79,14 @@ class DB:  # pylint: disable=too-many-public-methods
     def version_compatibility(self):
         return DATA_VERSION
 
+    def close(self):
+        self.con.close()
+
     def __enter__(self):
-        self.con = self.con.__enter__()
         return self
 
-    def __exit__(self, *args, **kwargs):
-        self.con.__exit__(*args, **kwargs)
+    def __exit__(self, *args):
+        self.close()
 
     def _test_execution_fk_column(self) -> str:
         return "environment_id"
@@ -100,9 +100,7 @@ class DB:  # pylint: disable=too-many-public-methods
                 "UPDATE file_fp SET mtime=?, fsha=? WHERE id = ?", new_mtimes
             )
 
-    def finish_execution(
-        self, exec_id, duration=None, select=True
-    ):  # pylint: disable=unused-argument
+    def finish_execution(self, exec_id, duration=None, select=True):  # pylint: disable=unused-argument
         self.update_saving_stats(exec_id, select)
         self.fetch_or_create_file_fp.cache_clear()
         with self.con as con:
@@ -193,9 +191,7 @@ class DB:  # pylint: disable=too-many-public-methods
         )
 
     @lru_cache(1000)
-    def fetch_or_create_file_fp(
-        self, filename, fsha, method_checksums
-    ):  # pylint: disable=R0801
+    def fetch_or_create_file_fp(self, filename, fsha, method_checksums):  # pylint: disable=R0801
         cursor = self.con.cursor()
         try:
             cursor.execute(
@@ -216,9 +212,9 @@ class DB:  # pylint: disable=too-many-public-methods
                 FROM
                     file_fp
                 WHERE
-                    filename = ? AND method_checksums = ?
+                    filename = ? AND fsha = ? AND method_checksums = ?
                 """,
-                (filename, method_checksums),
+                (filename, fsha, method_checksums),
             ).fetchone()
 
         return fingerprint_id
@@ -559,23 +555,24 @@ class DB:  # pylint: disable=too-many-public-methods
             return {"affected": method_misses, "failing": failing_tests}
 
     def delete_test_executions(self, test_names, exec_id):
-        self.con.executemany(
-            f"""
-            DELETE
-            FROM test_execution_file_fp
-            WHERE test_execution_id IN
-                (SELECT id FROM test_execution WHERE {self._test_execution_fk_column()} = ? AND test_name = ?)
-                """,
-            [(exec_id, test_name) for test_name in test_names],
-        )
-        self.con.executemany(
-            f"""
-            DELETE
-            FROM test_execution
-            WHERE {self._test_execution_fk_column()} = ?
-              AND test_name = ?""",
-            [(exec_id, test_name) for test_name in test_names],
-        )
+        with self.con as con:
+            con.executemany(
+                f"""
+                DELETE
+                FROM test_execution_file_fp
+                WHERE test_execution_id IN
+                    (SELECT id FROM test_execution WHERE {self._test_execution_fk_column()} = ? AND test_name = ?)
+                    """,
+                [(exec_id, test_name) for test_name in test_names],
+            )
+            con.executemany(
+                f"""
+                DELETE
+                FROM test_execution
+                WHERE {self._test_execution_fk_column()} = ?
+                  AND test_name = ?""",
+                [(exec_id, test_name) for test_name in test_names],
+            )
 
     def all_test_executions(self, exec_id):
         return {

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/testmon/process_code.py

@@ -86,14 +86,17 @@ class Block:
 
 @lru_cache(300)
 def bytes_to_string_and_fsha(byte_stream: bytes) -> Union[str, bytes]:
-    # Replace \f because of http://bugs.python.org/issue19035
-    byte_stream = byte_stream.replace(b"\f", b" ")
+    # The fsha must equal git's blob sha of the CRLF-normalized bytes, so that it
+    # matches the index entry returned by get_files_shas() and no read is needed
+    # for files git reports as unmodified. The header length is the byte length,
+    # and hashing happens before the \f replacement (git does not touch \f).
     byte_stream = byte_stream.replace(b"\r\n", b"\n")
-    byte_string = byte_stream.decode(source_encoding(byte_stream), "replace")
-    git_header = b"blob %u\0" % len(byte_string)
     hsh = hashlib.sha1()
-    hsh.update(git_header)
+    hsh.update(b"blob %u\0" % len(byte_stream))
     hsh.update(byte_stream)
+    # Replace \f because of http://bugs.python.org/issue19035
+    byte_stream = byte_stream.replace(b"\f", b" ")
+    byte_string = byte_stream.decode(source_encoding(byte_stream), "replace")
     if byte_string and byte_string[-1] != "\n":
         byte_string += "\n"
     return byte_string, hsh.hexdigest()
@@ -235,14 +238,18 @@ def read_source_sha(filename: str):
 def noncached_get_files_shas(directory):
     all_shas = {}
     try:
+        # Run inside `directory` so the printed paths are relative to it (they
+        # are the keys testmon looks up); a pathspec argument would print paths
+        # relative to the current working directory instead.
         result = run(
-            ["git", "ls-files", "--stage", "-m", directory],
+            ["git", "ls-files", "--stage", "-m"],
+            cwd=directory or None,
             capture_output=True,
             text=True,
             encoding="utf-8",
             check=True,
         )
-    except (FileNotFoundError, CalledProcessError):
+    except (FileNotFoundError, NotADirectoryError, CalledProcessError):
         return all_shas
 
     modified_files = set()

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/testmon/pytest_testmon.py

@@ -2,6 +2,7 @@
 """
 Main module of testmon pytest plugin.
 """
+
 import time
 import xmlrpc.client
 import os
@@ -105,7 +106,12 @@ def pytest_addoption(parser):
             " code serving different endpoints or Django settings."
         ),
     )
-
+    group.addoption(
+        "--testmon-singleprocess",
+        action="store_false",
+        dest="testmon_singleprocess",
+        help="Don't track subprocesses",
+    )
     group.addoption(
         "--tmnet",
         action="store_true",
@@ -132,6 +138,7 @@ def testmon_options(config):
         "testmon",
         "no-testmon",
         "environment_expression",
+        "testmon_singleprocess",
     ]:
         if config.getoption(label):
             result.append(label.replace("testmon_", ""))
@@ -195,7 +202,7 @@ def init_testmon_data(config: Config):
     if running_as == "worker" and exec_id is not None:
         # Initialize for xdist worker run
         testmon_data: TestmonData = TestmonData.for_worker(
-            rootdir=config.rootdir.strpath,
+            rootdir=str(config.rootpath),
             exec_id=exec_id,
             database=rpc_proxy,
             system_packages_change=system_packages_change,
@@ -205,7 +212,7 @@ def init_testmon_data(config: Config):
     else:
         # Initialize for local run (controller or single process)
         testmon_data: TestmonData = TestmonData.for_local_run(
-            rootdir=config.rootdir.strpath,
+            rootdir=str(config.rootpath),
             database=rpc_proxy,
             environment=environment,
             system_packages=system_packages,
@@ -234,7 +241,7 @@ def register_plugins(config, should_select, should_collect, cov_plugin):
         config.pluginmanager.register(
             TestmonCollect(
                 TestmonCollector(
-                    config.rootdir.strpath,
+                    str(config.rootpath),
                     testmon_labels=testmon_options(config),
                     cov_plugin=cov_plugin,
                 ),
@@ -243,8 +250,8 @@ def register_plugins(config, should_select, should_collect, cov_plugin):
             ),
             "TestmonCollect",
         )
-        if config.pluginmanager.hasplugin("xdist"):
-            config.pluginmanager.register(TestmonXdistSync())
+    if (should_select or should_collect) and config.pluginmanager.hasplugin("xdist"):
+        config.pluginmanager.register(TestmonXdistSync(sync=should_collect))
 
 
 def pytest_configure(config):
@@ -266,6 +273,10 @@ def pytest_configure(config):
     )
     config.testmon_config: TmConf = tm_conf
     if tm_conf.select or tm_conf.collect:
+        if config.pluginmanager.has_plugin(
+            "TestmonSelect"
+        ) or config.pluginmanager.has_plugin("TestmonCollect"):
+            pytest.exit("You cannot use two instances of testmon plugin.")
         try:
             init_testmon_data(config)
             register_plugins(config, tm_conf.select, tm_conf.collect, cov_plugin)
@@ -362,9 +373,7 @@ class TestmonCollect:
         self._sessionstarttime = time.time()
 
     @pytest.hookimpl(tryfirst=True, hookwrapper=True)
-    def pytest_pycollect_makeitem(
-        self, collector, name, obj
-    ):  # pylint: disable=unused-argument
+    def pytest_pycollect_makeitem(self, collector, name, obj):  # pylint: disable=unused-argument
         makeitem_result = yield
         items = makeitem_result.get_result() or []
         try:
@@ -375,9 +384,7 @@ class TestmonCollect:
             pass
 
     @pytest.hookimpl(tryfirst=True)
-    def pytest_collection_modifyitems(
-        self, session, config, items
-    ):  # pylint: disable=unused-argument
+    def pytest_collection_modifyitems(self, session, config, items):  # pylint: disable=unused-argument
         should_sync = not session.testsfailed and self._running_as in (
             "single",
             "controller",
@@ -386,9 +393,7 @@ class TestmonCollect:
             config.testmon_data.sync_db_fs_tests(retain=set(self.raw_test_names))
 
     @pytest.hookimpl(hookwrapper=True)
-    def pytest_runtest_protocol(
-        self, item, nextitem
-    ):  # pylint: disable=unused-argument
+    def pytest_runtest_protocol(self, item, nextitem):  # pylint: disable=unused-argument
         self.testmon.start_testmon(item.nodeid, nextitem.nodeid if nextitem else None)
         result = yield
         if result.excinfo and issubclass(result.excinfo[0], BaseException):
@@ -441,8 +446,9 @@ class TestmonCollect:
 
 
 class TestmonXdistSync:
-    def __init__(self):
+    def __init__(self, sync=True):
         self.await_nodes = 0
+        self.sync = sync
 
     def pytest_configure_node(self, node):
         """
@@ -459,25 +465,25 @@ class TestmonXdistSync:
         if running_as != "controller":
             return  # Safety check: only run on controller
 
+        # Count the node here, before it starts: counting it when it reports ready would let a
+        # fast worker's collection trigger sync_db_fs_tests while a slow one is still determining
+        # stability, which then sees the placeholder rows as stable tests and collects nothing.
+        self.await_nodes += 1
+
         # Only proceed if testmon_data has been initialized and workerinput exists
         if hasattr(node.config, "testmon_data") and hasattr(node, "workerinput"):
             testmon_data: TestmonData = node.config.testmon_data
             node.workerinput["testmon_exec_id"] = testmon_data.exec_id
-            node.workerinput[
-                "testmon_system_packages_change"
-            ] = testmon_data.system_packages_change
-            node.workerinput[
-                "testmon_files_of_interest"
-            ] = testmon_data.files_of_interest
-
-    def pytest_testnodeready(self, node):  # pylint: disable=unused-argument
-        self.await_nodes += 1
+            node.workerinput["testmon_system_packages_change"] = (
+                testmon_data.system_packages_change
+            )
+            node.workerinput["testmon_files_of_interest"] = (
+                testmon_data.files_of_interest
+            )
 
-    def pytest_xdist_node_collection_finished(
-        self, node, ids
-    ):  # pylint: disable=invalid-name
+    def pytest_xdist_node_collection_finished(self, node, ids):  # pylint: disable=invalid-name
         self.await_nodes += -1
-        if self.await_nodes == 0:
+        if self.await_nodes == 0 and self.sync:
             node.config.testmon_data.sync_db_fs_tests(retain=set(ids))
 
 
@@ -530,15 +536,13 @@ class TestmonSelect:
         self._interrupted = False
 
     def pytest_ignore_collect(self, collection_path: Path, config):
-        strpath = cached_relpath(str(collection_path), config.rootdir.strpath)
+        strpath = cached_relpath(str(collection_path), str(config.rootpath))
         if strpath in self.deselected_files and self.config.testmon_config.select:
             return True
         return None
 
     @pytest.hookimpl(trylast=True)
-    def pytest_collection_modifyitems(
-        self, session, config, items
-    ):  # pylint: disable=unused-argument
+    def pytest_collection_modifyitems(self, session, config, items):  # pylint: disable=unused-argument
         selected = []
         deselected = []
         for item in items:

{pytest_testmon-2.2.0 → pytest_testmon-2.3.0b0}/testmon/testmon_core.py

@@ -6,7 +6,7 @@ import sysconfig
 import textwrap
 from functools import lru_cache
 from collections import defaultdict
-from xmlrpc.client import Fault, ProtocolError
+from xmlrpc.client import Fault, ProtocolError, ServerProxy
 from socket import gaierror
 
 from typing import TypeVar
@@ -15,9 +15,9 @@ try:
     from pytest_cov.plugin import CovPlugin
 except ImportError:
     pass
-
 import pytest
 from coverage import Coverage, CoverageData
+from coverage.exceptions import CoverageException
 
 from testmon import db
 from testmon import TESTMON_VERSION as TM_CLIENT_VERSION
@@ -234,9 +234,7 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
                 ),
                 exc,
             )
-            self.db = db.DB(
-                os.path.join(self.rootdir, get_data_file_path())
-            )  # pylint: disable=invalid-name
+            self.db = db.DB(os.path.join(self.rootdir, get_data_file_path()))  # pylint: disable=invalid-name
             result = self.db.initiate_execution(
                 self.environment, system_packages, python_version, {}
             )
@@ -285,9 +283,23 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
         return False
 
     def close_connection(self):
-        pass
-        # TODO this is why there are "too many open files" on MacOS.
-        # we need the leave the connection open for tests
+        """Release the storage: the sqlite connection, or the transport of a tmnet proxy.
+
+        Idempotent. Tests that inspect the data after a run reopen it (see tests/lib4tests.py).
+        """
+        database, self.db = self.db, None
+        if database is None:
+            return
+        if isinstance(database, ServerProxy):
+            database("close")()  # attribute access would be a remote call
+        else:
+            database.close()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.close_connection()
 
     @property
     def all_tests(self):
@@ -321,27 +333,25 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
     def sync_db_fs_tests(self, retain):
         collected = retain.union(set(self.stable_test_names))
         add = list(collected - set(self.all_tests))
-        with self.db:
-            test_execution_file_fps = {
-                test_name: {
-                    "deps": (
-                        {
-                            "filename": home_file(test_name),
-                            "method_checksums": methods_to_checksums(["0match"]),
-                            "mtime": None,
-                            "fsha": None,
-                        },
-                    )
-                }
-                for test_name in add
-                if is_python_file(home_file(test_name))
+        test_execution_file_fps = {
+            test_name: {
+                "deps": (
+                    {
+                        "filename": home_file(test_name),
+                        "method_checksums": methods_to_checksums(["0match"]),
+                        "mtime": None,
+                        "fsha": None,
+                    },
+                )
             }
-            if test_execution_file_fps:
-                self.save_test_execution_file_fps(test_execution_file_fps)
+            for test_name in add
+            if is_python_file(home_file(test_name))
+        }
+        if test_execution_file_fps:
+            self.save_test_execution_file_fps(test_execution_file_fps)
 
         to_delete = list(set(self.all_tests) - collected)
-        with self.db as database:
-            database.delete_test_executions(to_delete, self.exec_id)
+        self.db.delete_test_executions(to_delete, self.exec_id)
 
     def determine_stable(self):
         files_fshas = {}
@@ -437,6 +447,22 @@ def cached_relpath(path, basepath):
     return os.path.relpath(path, basepath).replace(os.sep, "/")
 
 
+# coverage 7.10+ defaults to the sys.monitoring core on CPython 3.14+. That core
+# doesn't support dynamic contexts: sys.monitoring disables a line event once the
+# line has been recorded, so a line executed by several tests of one batch is
+# attributed to the first test only and the other tests lose the dependency.
+# testmon relies on contexts_by_lineno, so it needs the C tracer.
+COVERAGE_CORE = "ctrace"
+
+
+def force_context_capable_core(cov: Coverage):
+    try:
+        cov.set_option("run:core", COVERAGE_CORE)
+    except CoverageException:
+        # coverage < 7.10 has no core option and never defaults to sys.monitoring.
+        pass
+
+
 class TestmonCollector:
     coverage_stack: [Coverage] = []
 
@@ -516,9 +542,11 @@ class TestmonCollector:
                     "testmon doesn't support simultaneous run with pytest-cov when "
                     "branch coverage is on. Please disable branch coverage."
                 )
-
+        if subprocess:
+            self.setup_subprocess(params["include"])
         self.cov = Coverage(data_file=self.sub_cov_file, config_file=False, **params)
         self.cov._warn_no_data = False
+        force_context_capable_core(self.cov)
         if TestmonCollector.coverage_stack:
             TestmonCollector.coverage_stack[-1].stop()
 
@@ -617,11 +645,35 @@ class TestmonCollector:
             TestmonCollector.coverage_stack.pop()
         if self.sub_cov_file:
             os.remove(self.sub_cov_file + "_rc")
+            os.environ.pop("COVERAGE_CORE", None)
         os.environ.pop("COVERAGE_PROCESS_START", None)
         self.cov = None
         if TestmonCollector.coverage_stack:
             TestmonCollector.coverage_stack[-1].start()
 
+    def setup_subprocess(self, includes):
+        # This can be redone to use functionality from pytest-cov
+        if not os.path.exists(".tmontmp"):
+            os.makedirs(".tmontmp")
+        self.sub_cov_file = os.path.abspath(
+            ".tmontmp/.testmoncoverage" + str(random.randint(0, 1000000))
+        )
+        with open(self.sub_cov_file + "_rc", "w", encoding="utf-8") as subprocess_rc:
+            rc_content = textwrap.dedent(
+                """\
+                    [run]
+                    data_file = {}
+                    include = {}
+                    parallel=True
+                    """
+            ).format(
+                self.sub_cov_file,
+                "\n ".join(includes),
+            )
+            subprocess_rc.write(rc_content)
+        os.environ["COVERAGE_PROCESS_START"] = self.sub_cov_file + "_rc"
+        os.environ["COVERAGE_CORE"] = COVERAGE_CORE
+
 
 def eval_environment(environment, **kwargs):
     if not environment:

pytest_testmon-2.2.0/testmon/__init__.py

@@ -1,2 +0,0 @@
-"""PYTEST_DONT_REWRITE"""
-TESTMON_VERSION = "2.2.0"