pytest-flakefighters 0.1.5__py3-none-any.whl → 0.2.0__py3-none-any.whl

_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.5'
-__version_tuple__ = version_tuple = (0, 1, 5)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)
 
 __commit_id__ = commit_id = None

pytest_flakefighters/database_management.py

@@ -77,6 +77,8 @@ class Test(Base):
     """
 
     run_id: Mapped[int] = Column(Integer, ForeignKey("run.id"), nullable=False)
+    fspath: Mapped[str] = Column(String)
+    line_no: Mapped[int] = Column(Integer)
     name: Mapped[str] = Column(String)
     skipped: Mapped[bool] = Column(Boolean, default=False)
     executions = relationship(
@@ -177,7 +179,7 @@ class FlakefighterResult(Base):  # pylint: disable=R0902
     flaky: Mapped[bool] = Column(Boolean)
 
     __table_args__ = (
-        CheckConstraint("(test_execution_id IS NOT NULL) + (test_id IS NOT NULL) = 1", name="check_test_id_not_null"),
+        CheckConstraint("NOT (test_execution_id IS NULL AND test_id IS NULL)", name="check_test_id_not_null"),
     )
 
 

pytest_flakefighters/flakefighters/deflaker.py

@@ -2,6 +2,7 @@
 This module implements the DeFlaker FlakeFighter.
 """
 
+import ast
 import os
 
 import git
@@ -63,6 +64,18 @@ class DeFlaker(FlakeFighter):
                         range(hunk.target_start, hunk.target_start + hunk.target_length)
                     )
 
+        # Need to know method declaration lines so we can ignore new/changed test methods
+        self.method_declarations = {}
+        for file, lines in self.lines_changed.items():
+            with open(file) as f:
+                tree = ast.parse(f.read())
+
+            self.method_declarations[file] = [
+                node.lineno
+                for node in ast.walk(tree)
+                if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.lineno in lines
+            ]
+
     @classmethod
     def from_config(cls, config: dict):
         """
@@ -82,14 +95,14 @@ class DeFlaker(FlakeFighter):
         """
         return {"root": self.repo_root, "source_commit": self.source_commit, "target_commit": self.target_commit}
 
-    def line_modified_by_target_commit(self, file_path: str, line_number: int) -> bool:
+    def line_modified_by_target_commit(self, file_path: str, line_no: int) -> bool:
         """
         Returns true if the given line in the file has been modified by the present commit.
 
         :param file_path: The file to check.
-        :param line_number: The line number to check.
+        :param line_no: The line number to check.
         """
-        return line_number in self.lines_changed.get(file_path, [])
+        return line_no in self.lines_changed.get(file_path, [])
 
     def _flaky_execution(self, execution):
         """
@@ -97,10 +110,11 @@ class DeFlaker(FlakeFighter):
         :return: Boolean True of the test is classed as flaky and False otherwise.
         """
         return execution.outcome != "passed" and not any(
-            self.line_modified_by_target_commit(file_path, line_number)
+            self.line_modified_by_target_commit(file_path, line_no)
             for file_path in execution.coverage
-            for line_number in execution.coverage[file_path]
+            for line_no in execution.coverage[file_path]
             if file_path in self.lines_changed
+            and (line_no == execution.test.line_no or line_no not in self.method_declarations.get(file_path, []))
         )
 
     def flaky_test_live(self, execution: TestExecution):

pytest_flakefighters/plugin.py

@@ -137,9 +137,18 @@ class FlakeFighterPlugin:  # pylint: disable=R0902
         :return: The return value is not used, but only stops further processing.
         """
         item.execution_count = 0
-        executions = []
         skipped = False
 
+        fspath, line_inx, _ = item.location
+
+        test = Test(  # pylint: disable=E1123
+            name=item.nodeid,
+            fspath=fspath,
+            line_no=line_inx + 1,  # need to add one to the line index because this indexes from zero
+            skipped=skipped,
+        )
+        self.run.tests.append(test)
+
         for _ in range(self.rerun_strategy.max_reruns + 1):
             item.execution_count += 1
             item.ihook.pytest_runtest_logstart(nodeid=item.nodeid, location=item.location)
@@ -164,8 +173,7 @@ class FlakeFighterPlugin:  # pylint: disable=R0902
                         },
                         exception=report.exception,
                     )
-                    item.test_execution = test_execution
-                    executions.append(test_execution)
+                    test.executions.append(test_execution)
                     for ff in filter(lambda ff: ff.run_live, self.flakefighters):
                         ff.flaky_test_live(test_execution)
                     report.flaky = any(result.flaky for result in test_execution.flakefighter_results)
@@ -176,12 +184,6 @@ class FlakeFighterPlugin:  # pylint: disable=R0902
                 break  # Skip further reruns
 
         item.ihook.pytest_runtest_logfinish(nodeid=item.nodeid, location=item.location)
-        test = Test(  # pylint: disable=E1123
-            name=item.nodeid,
-            skipped=skipped,
-            executions=executions,
-        )
-        self.run.tests.append(test)
         return True
 
     def pytest_report_teststatus(

{pytest_flakefighters-0.1.5.dist-info → pytest_flakefighters-0.2.0.dist-info}/METADATA

@@ -1,10 +1,18 @@
 Metadata-Version: 2.4
 Name: pytest-flakefighters
-Version: 0.1.5
+Version: 0.2.0
 Summary: Pytest plugin implementing flaky test failure detection and classification.
 Author: TestFLARE Team
+Project-URL: Homepage, https://test-flare.github.io/
+Project-URL: Documentation, https://pytest-flakefighters.readthedocs.io
 Project-URL: Repository, https://github.com/test-flare/pytest-flakefighters
-Requires-Python: >=3.10
+Project-URL: Issues, https://github.com/test-flare/pytest-flakefighters/issues
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest>=6.2.0
@@ -13,7 +21,7 @@ Requires-Dist: GitPython>=3.1.45
 Requires-Dist: unidiff>=0.7.5
 Requires-Dist: sqlalchemy>=2.0.43
 Requires-Dist: dotenv>=0.9.9
-Requires-Dist: pandas
+Requires-Dist: pandas>=2.3
 Requires-Dist: scipy<=1.15
 Requires-Dist: pyyaml>=6
 Requires-Dist: scikit-learn>=1.7
@@ -28,19 +36,24 @@ Requires-Dist: sphinx_rtd_theme; extra == "dev"
 Requires-Dist: tox>=4.31.0; extra == "dev"
 Requires-Dist: myst_parser; extra == "dev"
 Requires-Dist: nbsphinx; extra == "dev"
+Requires-Dist: pytest-html; extra == "dev"
+Requires-Dist: pytest-json-report>=1.5; extra == "dev"
+Provides-Extra: pg
+Requires-Dist: psycopg2>2.9; extra == "pg"
 Dynamic: license-file
 
 # Pytest FlakeFighters
+### Pytest plugin implementing flaky test failure detection and classification.
 
+[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 [![PyPI version](https://img.shields.io/pypi/v/pytest-flakefighters.svg)](https://pypi.org/project/pytest-flakefighters)
 [![Python versions](https://img.shields.io/pypi/pyversions/pytest-flakefighters.svg)](https://pypi.org/project/pytest-flakefighters)
+![Test status](https://github.com/test-flare/pytest-flakefighters/actions/workflows/ci-tests.yaml/badge.svg)
+[![codecov](https://codecov.io/gh/test-flare/pytest-flakefighters/branch/main/graph/badge.svg?token=04ijFVrb4a)](https://codecov.io/gh/test-flare/pytest-flakefighters)
+[![Documentation Status](https://readthedocs.org/projects/causal-testing-framework/badge/?version=latest)](https://causal-testing-framework.readthedocs.io/en/latest/?badge=latest)
+![GitHub License](https://img.shields.io/github/license/test-flare/pytest-flakefighters)
 
-Pytest plugin implementing flaky test failure detection and
-classification.
 
-------------------------------------------------------------------------
-
-This [pytest](https://github.com/pytest-dev/pytest) plugin was generated with [Cookiecutter](https://github.com/audreyr/cookiecutter) along with [\@hackebrot](https://github.com/hackebrot)\'s [cookiecutter-pytest-plugin](https://github.com/pytest-dev/cookiecutter-pytest-plugin) template.
 
 ## Features
 
@@ -93,3 +106,7 @@ Both extend the base class `FlakeFighter` and implement the `flaky_failure` meth
 ## Issues
 
 If you encounter any problems, please [file an issue](https://github.com/test-flare/pytest-flakefighters/issues) along with a detailed description.
+
+------------------------------------------------------------------------
+
+This [pytest](https://github.com/pytest-dev/pytest) plugin was generated with [Cookiecutter](https://github.com/audreyr/cookiecutter) along with [\@hackebrot](https://github.com/hackebrot)\'s [cookiecutter-pytest-plugin](https://github.com/pytest-dev/cookiecutter-pytest-plugin) template.

{pytest_flakefighters-0.1.5.dist-info → pytest_flakefighters-0.2.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-_version.py,sha256=rdxBMYpwzYxiWk08QbPLHSAxHoDfeKWwyaJIAM0lSic,704
+_version.py,sha256=Dg8AmJomLVpjKL6prJylOONZAPRtB86LOce7dorQS_A,704
 pytest_flakefighters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_flakefighters/database_management.py,sha256=MDwwpF8FwmFX6is9pVPye7qEOrjZXOsfXG2UI5I7uk4,7029
+pytest_flakefighters/database_management.py,sha256=mSdrP4enD6_oT941y5KAP-Jae84FihVJEvqCUFPhrss,7105
 pytest_flakefighters/function_coverage.py,sha256=IgzWHMFgkVrc68ZjQ1o27tGxKa8WvcMcGW8RWnpFLVw,2187
 pytest_flakefighters/main.py,sha256=N0yGSGA-ZLtsKRCtSCIdnw7RPVEtLnXUhnftQGHjujA,5430
-pytest_flakefighters/plugin.py,sha256=0XcbZooY_hCwCI1Kg1YntiWQPUn_buDsWBcal0cbEtQ,8802
+pytest_flakefighters/plugin.py,sha256=kdagObAK93ab6-5lckwkBR846RPspxXen4qlEcsAjB8,8866
 pytest_flakefighters/rerun_strategies.py,sha256=YI-spvm0dhB-gGM9IEgDz19NHvzD_XesZ8lDcBDGSJM,2536
 pytest_flakefighters/flakefighters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pytest_flakefighters/flakefighters/abstract_flakefighter.py,sha256=bchRwoNzQaFhSknT9wKDpbf3EiReHPsHsDhm5qi8y_o,1953
 pytest_flakefighters/flakefighters/coverage_independence.py,sha256=5swoY1jOaaGFlZNX6PdejBFVd7Gpi3zsaW5W6toIzk8,4480
-pytest_flakefighters/flakefighters/deflaker.py,sha256=g0vPS2sEiD9XWFVu_FEZAw2pVkw9vGMWFa7Do1C3sck,5388
+pytest_flakefighters/flakefighters/deflaker.py,sha256=GjmAA5i7YFJKbNaheWihqUqyu9_z2NZwqy6U--ztj9c,5989
 pytest_flakefighters/flakefighters/traceback_matching.py,sha256=LheOEqCvrBDrZJm4RK4ZFFcebWs4ggP7qRiUPg8HQpM,6926
-pytest_flakefighters-0.1.5.dist-info/licenses/LICENSE,sha256=tTzR2CWQMPOp-mQIQqi0cTRkaogeBUmW06blQsBLdQg,1082
-pytest_flakefighters-0.1.5.dist-info/METADATA,sha256=oJo4dnKiNGWO0-kPdvAz1zyCESfAWTh87k_-P8KRwf0,4390
-pytest_flakefighters-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_flakefighters-0.1.5.dist-info/entry_points.txt,sha256=xockvN1AszN2XqaET77JDIRdOafgm3DdvOtHgVw-aDU,424
-pytest_flakefighters-0.1.5.dist-info/top_level.txt,sha256=bWwe0xVZ_l2CP8KSnztW6FafZKQZ7zUTMa1U32geY28,30
-pytest_flakefighters-0.1.5.dist-info/RECORD,,
+pytest_flakefighters-0.2.0.dist-info/licenses/LICENSE,sha256=tTzR2CWQMPOp-mQIQqi0cTRkaogeBUmW06blQsBLdQg,1082
+pytest_flakefighters-0.2.0.dist-info/METADATA,sha256=lXyrJ4fAUh8pJ2mMn3vCPoKSIkFwtZlt2rBccWbOdtM,5772
+pytest_flakefighters-0.2.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+pytest_flakefighters-0.2.0.dist-info/entry_points.txt,sha256=xockvN1AszN2XqaET77JDIRdOafgm3DdvOtHgVw-aDU,424
+pytest_flakefighters-0.2.0.dist-info/top_level.txt,sha256=bWwe0xVZ_l2CP8KSnztW6FafZKQZ7zUTMa1U32geY28,30
+pytest_flakefighters-0.2.0.dist-info/RECORD,,

{pytest_flakefighters-0.1.5.dist-info → pytest_flakefighters-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any