test: handle excluded lines in coverage plugin

Author: oscarbenjamin

.coveragerc

@@ -2,5 +2,5 @@
 plugins = coverage_plugin
 
 [report]
-exclude_lines =
+exclude_also =
     assert False

coverage_plugin.py

@@ -62,7 +62,7 @@ def get_cython_build_rules():
 
 
 @cache
-def parse_all_cfile_lines():
+def parse_all_cfile_lines(exclude_patterns=None):
     """Parse all generated C files from the build directory."""
     #
     # Each .c file can include code generated from multiple Cython files (e.g.
@@ -80,7 +80,7 @@ def parse_all_cfile_lines():
 
     for c_file, _ in get_cython_build_rules():
 
-        cfile_lines = parse_cfile_lines(c_file)
+        cfile_lines = parse_cfile_lines(c_file, exclude_patterns=exclude_patterns)
 
         for cython_file, line_map in cfile_lines.items():
             if cython_file == '(tree fragment)':
@@ -94,15 +94,22 @@ def parse_all_cfile_lines():
     return all_code_lines
 
 
-def parse_cfile_lines(c_file):
+def parse_cfile_lines(c_file, exclude_patterns=None):
     """Use Cython's coverage plugin to parse the C code."""
     from Cython.Coverage import Plugin
-    return Plugin()._parse_cfile_lines(c_file)
+    p = Plugin()
+    p._excluded_line_patterns = list(exclude_patterns)
+    return p._parse_cfile_lines(c_file)
 
 
 class Plugin(CoveragePlugin):
     """A coverage plugin for a spin/meson project with Cython code."""
 
+    def configure(self, config):
+        # Entry point for coverage "configurer".
+        # Read the regular expressions from the coverage config that match lines to be excluded from coverage.
+        self.exclude_patterns = tuple(config.get_option("report:exclude_lines"))
+
     def file_tracer(self, filename):
         """Find a tracer for filename to handle trace events."""
         path = Path(filename)
@@ -121,7 +128,7 @@ def file_tracer(self, filename):
     def file_reporter(self, filename):
         """Return a file reporter for filename."""
         srcfile = Path(filename).relative_to(src_dir)
-        return CyFileReporter(srcfile)
+        return CyFileReporter(srcfile, exclude_patterns=self.exclude_patterns)
 
 
 class CyFileTracer(FileTracer):
@@ -157,14 +164,15 @@ def get_source_filename(filename):
 class CyFileReporter(FileReporter):
     """File reporter for Cython or Python files (.pyx,.pxd,.py)."""
 
-    def __init__(self, srcpath):
+    def __init__(self, srcpath, exclude_patterns):
         abspath = (src_dir / srcpath)
         assert abspath.exists()
 
         # filepath here needs to match dynamic_source_filename
         super().__init__(str(abspath))
 
         self.srcpath = srcpath
+        self.exclude_patterns = exclude_patterns
 
     def relative_filename(self):
         """Path displayed in the coverage reports."""
@@ -173,7 +181,7 @@ def relative_filename(self):
     def lines(self):
         """Set of line numbers for possibly traceable lines."""
         srcpath = str(self.srcpath)
-        all_line_maps = parse_all_cfile_lines()
+        all_line_maps = parse_all_cfile_lines(exclude_patterns=self.exclude_patterns)
         line_map = all_line_maps[srcpath]
         return set(line_map)
 

src/flint/types/fmpz_poly.pyx

@@ -107,9 +107,6 @@ cdef class fmpz_poly(flint_poly):
         cdef bint r
         if op != 2 and op != 3:
             raise TypeError("polynomials cannot be ordered")
-        self = any_as_fmpz_poly(self)
-        if self is NotImplemented:
-            return self
         other = any_as_fmpz_poly(other)
         if other is NotImplemented:
             return other
@@ -456,7 +453,7 @@ cdef class fmpz_poly(flint_poly):
             return []
         flags = 0
         if verbose:
-            flags = 1
+            flags = 1  # pragma: no cover
         roots = []
         fmpz_poly_factor_init(fac)
         fmpz_poly_factor_squarefree(fac, self.val)
@@ -551,8 +548,8 @@ cdef class fmpz_poly(flint_poly):
             arb_poly_init(t)
             arb_poly_swinnerton_dyer_ui(t, n, 0)
             if not arb_poly_get_unique_fmpz_poly((<fmpz_poly>u).val, t):
-                arb_poly_clear(t)
-                raise ValueError("insufficient precision")
+                arb_poly_clear(t)                           # pragma: no cover
+                raise ValueError("insufficient precision")  # pragma: no cover
             arb_poly_clear(t)
         else:
             fmpz_poly_swinnerton_dyer((<fmpz_poly>u).val, n)