pytest-testmon 2.1.4__tar.gz → 2.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-testmon
-Version: 2.1.4
+Version: 2.2.0
 Summary: selects tests affected by changed files and methods
 Author-email: Tibor Arpas <tibor@testmon.org>
 License: MIT
@@ -15,10 +15,10 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pytest
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytest<9,>=5
+Requires-Dist: pytest<10,>=5
 Requires-Dist: coverage<8,>=6
 Dynamic: license-file
 

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/pyproject.toml

@@ -11,7 +11,7 @@ dynamic =  ["version"]
 
 description = "selects tests affected by changed files and methods"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 keywords = ["testing", "pytest", "plugin"]
 license = { text = "MIT" }
 classifiers = [
@@ -27,7 +27,7 @@ classifiers = [
     "Framework :: Pytest",
 ]
 dependencies = [
-    "pytest>=5,<9",
+    "pytest>=5,<10",
     "coverage>=6,<8",
 ]
 
@@ -61,4 +61,4 @@ exclude = '''
 
 
 [project.entry-points.pytest11]
-pytest-testmon = "testmon.pytest_testmon"
+pytest-testmon = "testmon.pytest_testmon"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-testmon
-Version: 2.1.4
+Version: 2.2.0
 Summary: selects tests affected by changed files and methods
 Author-email: Tibor Arpas <tibor@testmon.org>
 License: MIT
@@ -15,10 +15,10 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pytest
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytest<9,>=5
+Requires-Dist: pytest<10,>=5
 Requires-Dist: coverage<8,>=6
 Dynamic: license-file
 

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/pytest_testmon.egg-info/requires.txt

@@ -1,2 +1,2 @@
-pytest<9,>=5
+pytest<10,>=5
 coverage<8,>=6

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/__init__.py

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

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/configure.py

@@ -78,7 +78,8 @@ def _get_noselect_reasons(options):
     if options["lf"]:
         return ["--lf was used"]
 
-    if any(re.match(r"(.*)\.py::(.*)", opt) for opt in options["file_or_dir"] or []):
+    file_or_dir = options.get("file_or_dir") or []
+    if any(re.match(r"(.*)\.py::(.*)", opt) for opt in file_or_dir):
         return ["you selected tests manually"]
 
     return []

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/db.py

@@ -10,7 +10,7 @@ from testmon.process_code import blob_to_checksums, checksums_to_blob
 from testmon.common import TestExecutions
 
 
-DATA_VERSION = 13
+DATA_VERSION = 14
 
 ChangedFileData = namedtuple(
     "ChangedFileData", "filename name method_checksums id failed"
@@ -359,7 +359,7 @@ class DB:  # pylint: disable=too-many-public-methods
                 duration FLOAT,
                 failed BIT,
                 forced BIT,
-                FOREIGN KEY({self._test_execution_fk_column()}) REFERENCES {self._test_execution_fk_table()}(id));
+                FOREIGN KEY({self._test_execution_fk_column()}) REFERENCES {self._test_execution_fk_table()}(id) ON DELETE CASCADE);
                 CREATE INDEX test_execution_fk_name ON test_execution ({self._test_execution_fk_column()}, test_name);
             """
 
@@ -394,7 +394,7 @@ class DB:  # pylint: disable=too-many-public-methods
             CREATE TABLE test_execution_file_fp (
                 test_execution_id INTEGER,
                 fingerprint_id INTEGER,
-                FOREIGN KEY(test_execution_id) REFERENCES test_execution(id),
+                FOREIGN KEY(test_execution_id) REFERENCES test_execution(id) ON DELETE CASCADE,
                 FOREIGN KEY(fingerprint_id) REFERENCES file_fp(id)
             );
             CREATE INDEX test_execution_file_fp_both ON test_execution_file_fp (test_execution_id, fingerprint_id);
@@ -403,7 +403,7 @@ class DB:  # pylint: disable=too-many-public-methods
                 suite_execution_id INTEGER,
                 filename TEXT,
                 fsha text,
-                FOREIGN KEY(suite_execution_id) REFERENCES suite_execution(id)
+                FOREIGN KEY(suite_execution_id) REFERENCES suite_execution(id) ON DELETE CASCADE
                 );
                 CREATE UNIQUE INDEX sefch_suite_id_filename_sha ON suite_execution_file_fsha(suite_execution_id, filename, fsha);
             """
@@ -659,7 +659,7 @@ class DB:  # pylint: disable=too-many-public-methods
                 ORDER BY id DESC
                 """,
                 (environment_name,),
-            ).fetchone()
+            ).fetchone()  # TODO to pick best environment of many with the same name, we would need to fetch all.
 
             if environment:
                 environment_id = environment["id"]
@@ -669,7 +669,7 @@ class DB:  # pylint: disable=too-many-public-methods
                 )
             else:
                 packages_changed = False
-            if not environment or packages_changed:
+            if not environment:
                 try:
                     cursor.execute(
                         """
@@ -694,6 +694,19 @@ class DB:  # pylint: disable=too-many-public-methods
                         (environment_name,),
                     ).fetchone()
                     environment_id = environment["id"]
+            elif packages_changed:
+                cursor.execute(
+                    """
+                    INSERT INTO environment (environment_name, system_packages, python_version)
+                    VALUES (?, ?, ?)
+                    """,
+                    (environment_name, system_packages, python_version),
+                )
+                new_environment_id = cursor.lastrowid
+                cursor.execute(
+                    "DELETE FROM environment WHERE id = ?", (environment_id,)
+                )
+                environment_id = new_environment_id
 
             return environment_id, packages_changed
 

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/process_code.py

@@ -238,7 +238,8 @@ def noncached_get_files_shas(directory):
         result = run(
             ["git", "ls-files", "--stage", "-m", directory],
             capture_output=True,
-            universal_newlines=True,
+            text=True,
+            encoding="utf-8",
             check=True,
         )
     except (FileNotFoundError, CalledProcessError):

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/pytest_testmon.py

@@ -111,7 +111,7 @@ def pytest_addoption(parser):
         action="store_true",
         dest="tmnet",
         help=(
-            "This is used for internal beta. Please don't use. You can go to https://www.testmon.net/ to register."
+            "Use tmnet cloud for storage instead of .testmondata file used by --testmon (see https://www.testmon.net)."
         ),
     )
 
@@ -165,24 +165,52 @@ def init_testmon_data(config: Config):
                     )
                 else:
                     tmnet_api_key = os.getenv("TMNET_API_KEY")
-            elif tmnet_api_key is None:
-                logger.warning(
-                    "TMNET_API_KEY not set.",
+
+            if not tmnet_api_key.strip():
+                raise ValueError(
+                    "TMNET_API_KEY is required when using --tmnet. "
+                    "Please set it in pytest.ini, pyproject.toml, or as an environment variable. "
                 )
+
             rpc_proxy = xmlrpc.client.ServerProxy(
                 url,
                 allow_none=True,
-                headers=[("x-api-key", tmnet_api_key)],
+                headers=[("x-api-key", tmnet_api_key.strip())],
             )
 
-    testmon_data = TestmonData(
-        rootdir=config.rootdir.strpath,
-        database=rpc_proxy,
-        environment=environment,
-        system_packages=system_packages,
-        readonly=get_running_as(config) == "worker",
-    )
-    testmon_data.determine_stable(bool(rpc_proxy))
+    # Check if we're a worker and have exec_id from controller
+    running_as = get_running_as(config)
+    exec_id = None
+    system_packages_change = None
+    files_of_interest = None
+
+    if running_as == "worker" and hasattr(config, "workerinput"):
+        # Use exec_id sent from controller
+        exec_id = config.workerinput.get("testmon_exec_id")
+        system_packages_change = config.workerinput.get(
+            "testmon_system_packages_change"
+        )
+        files_of_interest = config.workerinput.get("testmon_files_of_interest")
+
+    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,
+            exec_id=exec_id,
+            database=rpc_proxy,
+            system_packages_change=system_packages_change,
+            files_of_interest=files_of_interest,
+            environment=environment,
+        )
+    else:
+        # Initialize for local run (controller or single process)
+        testmon_data: TestmonData = TestmonData.for_local_run(
+            rootdir=config.rootdir.strpath,
+            database=rpc_proxy,
+            environment=environment,
+            system_packages=system_packages,
+        )
+    testmon_data.determine_stable()
     config.testmon_data = testmon_data
 
 
@@ -321,7 +349,9 @@ def pytest_unconfigure(config):
 
 
 class TestmonCollect:
-    def __init__(self, testmon, testmon_data, running_as="single", cov_plugin=None):
+    def __init__(
+        self, testmon, testmon_data: TestmonData, running_as="single", cov_plugin=None
+    ):
         self.testmon_data: TestmonData = testmon_data
         self.testmon: TestmonCollector = testmon
         self._running_as = running_as
@@ -371,7 +401,9 @@ class TestmonCollect:
         if call.when == "teardown":
             report = result.get_result()
             report.nodes_files_lines = self.testmon.get_batch_coverage_data()
-            result.force_result(report)
+            result.force_result(
+                report
+            )  # under xdist, report is serialized on the worker and sent to the controller
 
     @pytest.hookimpl
     def pytest_runtest_logreport(self, report):
@@ -412,6 +444,32 @@ class TestmonXdistSync:
     def __init__(self):
         self.await_nodes = 0
 
+    def pytest_configure_node(self, node):
+        """
+        Send exec_id and related data from controller to worker during xdist initialization.
+        This avoids each worker having to independently determine the environment and check
+        for package changes.
+
+        Note: This hook is called on the controller side for each worker node.
+        The node.config here is the controller's config, not the worker's config.
+        """
+        # Verify we're on the controller (not a worker)
+        # node.config in this hook is the controller's config
+        running_as = get_running_as(node.config)
+        if running_as != "controller":
+            return  # Safety check: only run on controller
+
+        # 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
 
@@ -455,7 +513,7 @@ def format_time_saved(seconds):
 
 
 class TestmonSelect:
-    def __init__(self, config, testmon_data):
+    def __init__(self, config, testmon_data: TestmonData):
         self.testmon_data: TestmonData = testmon_data
         self.config = config
 

{pytest_testmon-2.1.4 → pytest_testmon-2.2.0}/testmon/testmon_core.py

@@ -157,23 +157,14 @@ def collect_mhashes(source_tree, new_changed_file_data):
 class TestmonData:  # pylint: disable=too-many-instance-attributes
     __test__ = False
 
-    def __init__(  # pylint: disable=too-many-arguments
+    def __init__(
         self,
         rootdir,
         database=None,
-        environment=None,
-        system_packages=None,
-        python_version=None,
         readonly=False,
     ):
         self.rootdir = rootdir
-        self.environment = environment if environment else "default"
         self.source_tree = SourceTree(rootdir=self.rootdir)
-        if system_packages is None:
-            system_packages = get_system_packages()
-        system_packages = drop_patch_version(system_packages)
-        if not python_version:
-            python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
 
         if database:
             self.db = database  # pylint: disable=invalid-name
@@ -182,6 +173,48 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
                 os.path.join(self.rootdir, get_data_file_path()), readonly=readonly
             )  # pylint: disable=invalid-name
 
+        # Initialize instance variables (will be set by init methods)
+        self.environment = None
+        self.exec_id = None
+        self.system_packages_change = None
+        self.files_of_interest = None
+        self.all_files = {}
+        self.unstable_test_names = None
+        self.unstable_files = None
+        self.stable_test_names = None
+        self.stable_files = None
+        self.failing_tests = None
+
+    @classmethod
+    def for_local_run(
+        cls,
+        rootdir,
+        database=None,
+        environment=None,
+        system_packages=None,
+        python_version=None,
+    ):
+        instance = cls(rootdir, database=database, readonly=False)
+        instance._init_for_local_run(environment, system_packages, python_version)
+        return instance
+
+    def _init_for_local_run(
+        self,
+        environment=None,
+        system_packages=None,
+        python_version=None,
+    ):
+        """Internal method to initialize for local run."""
+        self.environment = environment if environment else "default"
+
+        if system_packages is None:
+            system_packages = get_system_packages()
+        system_packages = drop_patch_version(system_packages)
+
+        if not python_version:
+            python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+
+        # Initiate execution (controller or single process)
         try:
             result = self.db.initiate_execution(
                 self.environment,
@@ -207,21 +240,49 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
             result = self.db.initiate_execution(
                 self.environment, system_packages, python_version, {}
             )
-        self.exec_id = result["exec_id"]
 
+        self.exec_id = result["exec_id"]
         self.system_packages_change = result["packages_changed"]
         self.files_of_interest = result["filenames"]
 
-        self.all_files = {}
-        self.unstable_test_names = None
-        self.unstable_files = None
-        self.stable_test_names = None
-        self.stable_files = None
-        self.failing_tests = None
+    @classmethod
+    def for_worker(  # pylint: disable=too-many-arguments
+        cls,
+        rootdir,
+        exec_id,
+        database=None,
+        system_packages_change=None,
+        files_of_interest=None,
+        environment=None,
+    ):
+        instance = cls(rootdir, database=database, readonly=True)
+        instance._init_for_worker(
+            exec_id, system_packages_change, files_of_interest, environment
+        )
+        return instance
+
+    def _init_for_worker(
+        self,
+        exec_id,
+        system_packages_change=None,
+        files_of_interest=None,
+        environment=None,
+    ):
+        """Internal method to initialize for worker run."""
+        self.exec_id = exec_id
+        self.system_packages_change = system_packages_change
+        self.files_of_interest = files_of_interest
+        if environment:
+            self.environment = environment
+        elif not hasattr(self, "environment") or self.environment is None:
+            self.environment = "default"
 
     @property
     def new_db(self):
-        return self.db.file_created
+        # Only local DB instances have file_created attribute
+        if isinstance(self.db, db.DB):
+            return self.db.file_created
+        return False
 
     def close_connection(self):
         pass
@@ -282,7 +343,7 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
         with self.db as database:
             database.delete_test_executions(to_delete, self.exec_id)
 
-    def determine_stable(self, assert_old=True):
+    def determine_stable(self):
         files_fshas = {}
         for filename in self.files_of_interest:
             module = self.source_tree.get_file(filename)
@@ -299,9 +360,6 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
         tests = self.db.determine_tests(self.exec_id, files_mhashes)
         affected_tests, self.failing_tests = tests["affected"], tests["failing"]
 
-        if assert_old:
-            self.assert_old_determin_stable(affected_tests)
-
         self.all_files = set(self.db.filenames(self.exec_id))
         self.unstable_test_names = set()
         self.unstable_files = set()
@@ -313,47 +371,6 @@ class TestmonData:  # pylint: disable=too-many-instance-attributes
         self.stable_test_names = set(self.all_tests) - self.unstable_test_names
         self.stable_files = set(self.all_files) - self.unstable_files
 
-    def assert_old_determin_stable(self, new_fingerprint_misses):
-        filenames_fingerprints = self.db.filenames_fingerprints(self.exec_id)
-
-        _, fsha_misses = split_filter(
-            self.source_tree, check_fsha, filenames_fingerprints
-        )  # check 2. fsha vs filesystem
-
-        # with the list of fingerprint_ids go to the database
-        # and fetch all the data needed for next step
-
-        changed_file_data = self.db.fetch_changed_file_data(
-            [fsha_miss["fingerprint_id"] for fsha_miss in (fsha_misses)],
-            self.exec_id,
-        )
-
-        # changed_file_data:
-        # [(filename, test_name, method_fshas, fingerprint_id, failed )]
-        # All the test_names in this list have a dependency on one
-        # or more changed files. And we also have the fingerprints
-        # of data content which they depend on. So it’s possible to
-        # filter out the node_ids where the content of the changed file
-        # still matches the fingerprint
-
-        _, fingerprint_misses = split_filter(
-            self.source_tree, check_fingerprint, changed_file_data
-        )
-
-        if {fingerprint_miss[1] for fingerprint_miss in fingerprint_misses} != set(
-            new_fingerprint_misses
-        ):
-            print("ERROR: old and new fingerprint misses differ.. printing old algo")
-            print(
-                "\n".join(
-                    sorted(
-                        {fingerprint_miss[1] for fingerprint_miss in fingerprint_misses}
-                    )
-                )
-            )
-            print("printing new algo")
-            print("\n".join(sorted(new_fingerprint_misses)))
-
     @property
     def avg_durations(self) -> dict:
         stats = defaultdict(lambda: {"test_execution": 0, "sum_duration": 0})