test: no longer need to support multiple 'lines'

Since 3.10 is our minimum, and it conforms to PEP 626, we know what
lines will be reported, and don't need multiple options.

Author: nedbat

tests/coveragetest.py

@@ -145,7 +145,7 @@ def check_coverage(
         self,
         text: str,
         *,
-        lines: Sequence[TLineNo] | Sequence[list[TLineNo]] | None = None,
+        lines: Sequence[TLineNo] | None = None,
         missing: str = "",
         report: str = "",
         excludes: Iterable[str] | None = None,
@@ -157,10 +157,9 @@ def check_coverage(
         """Check the coverage measurement of `text`.
 
         The source `text` is run and measured.  `lines` are the line numbers
-        that are executable, or a list of possible line numbers, any of which
-        could match. `missing` are the lines not executed, `excludes` are
-        regexes to match against for excluding lines, and `report` is the text
-        of the measurement report.
+        that are executable, `missing` are the lines not executed, `excludes`
+        are regexes to match against for excluding lines, and `report` is the
+        text of the measurement report.
 
         For branch measurement, `branchz` is a string that can be decoded into
         arcs in the code (see `arcz_to_arcs` for the encoding scheme).
@@ -200,42 +199,9 @@ def check_coverage(
         analysis = cov._analyze(mod)
         statements = sorted(analysis.statements)
         if lines:
-            if isinstance(lines[0], int):
-                # lines is just a list of numbers, it must match the statements
-                # found in the code.
-                assert statements == lines, f"lines: {statements!r} != {lines!r}"
-            else:
-                # lines is a list of possible line number lists, one of them
-                # must match.
-                for i, line_list in enumerate(lines):  # pylint: disable=unused-variable
-                    if statements == line_list:
-                        # PYVERSIONS: we might be able to trim down multiple
-                        # lines passed into this function.
-                        # Uncomment this code, run the whole test suite, then
-                        # sort /tmp/check_coverage_multi_line.out to group the
-                        # tests together and see if any of the `lines` elements
-                        # haven't been used.
-                        # One of the calls in test_successful_coverage passes
-                        # three `lines` elements, only one of which is right.
-                        # We need to keep that test until we can delete the
-                        # multi-lines option entirely.
-                        #
-                        # import inspect, platform
-                        # frinfo = inspect.getframeinfo(inspect.currentframe().f_back)
-                        # version = "{} {}.{}".format(
-                        #     platform.python_implementation(),
-                        #     *sys.version_info[:2],
-                        # )
-                        # with open("/tmp/check_coverage_multi_line.out", "a") as f:
-                        #     print(
-                        #         f"{frinfo.filename}@{frinfo.lineno}: "
-                        #         + f"lines {i + 1}/{len(lines)}: {version}",
-                        #         file=f,
-                        #     )
-                        break
-                else:
-                    assert False, f"None of the lines choices matched {statements!r}"
-
+            # lines is a list of numbers, it must match the statements
+            # found in the code.
+            assert statements == lines, f"lines: {statements!r} != {lines!r}"
             missing_formatted = analysis.missing_formatted()
             msg = f"missing: {missing_formatted!r} != {missing!r}"
             assert missing_formatted == missing, msg

tests/test_coverage.py

@@ -26,14 +26,6 @@ def test_successful_coverage(self) -> None:
             """,
             lines=[1, 2],
         )
-        # You can provide a list of possible statement matches.
-        self.check_coverage(
-            """\
-            a = 1
-            b = 2
-            """,
-            lines=([100], [1, 2], [1723, 47]),
-        )
         # You can specify missing lines.
         self.check_coverage(
             """\
@@ -55,16 +47,6 @@ def test_failed_coverage(self) -> None:
                 """,
                 lines=[1],
             )
-        # If the list of lines possibilities is wrong, the msg shows right.
-        msg = r"None of the lines choices matched \[1, 2]"
-        with pytest.raises(AssertionError, match=msg):
-            self.check_coverage(
-                """\
-                a = 1
-                b = 2
-                """,
-                lines=([1], [2]),
-            )
         # If the missing lines are wrong, the message shows right and wrong.
         with pytest.raises(AssertionError, match=r"'3' != '37'"):
             self.check_coverage(
@@ -167,7 +149,7 @@ def test_expression(self) -> None:
             12
             23
             """,
-            lines=([1, 2], [2]),
+            lines=[1, 2],
             missing="",
         )
         self.check_coverage(
@@ -176,7 +158,7 @@ def test_expression(self) -> None:
             23
             a = 3
             """,
-            lines=([1, 2, 3], [3]),
+            lines=[1, 2, 3],
             missing="",
         )
         self.check_coverage(
@@ -185,7 +167,7 @@ def test_expression(self) -> None:
             1 + \\
                 2
             """,
-            lines=([1, 2], [2]),
+            lines=[1, 2],
             missing="",
         )
         self.check_coverage(
@@ -195,7 +177,7 @@ def test_expression(self) -> None:
                 2
             a = 4
             """,
-            lines=([1, 2, 4], [4]),
+            lines=[1, 2, 4],
             missing="",
         )
 
@@ -700,7 +682,7 @@ def test_extra_doc_string(self) -> None:
             b = 3
             assert (a,b) == (1,3)
             """,
-            lines=([1, 3, 4], [1, 2, 3, 4]),
+            lines=[1, 2, 3, 4],
             missing="",
         )
         self.check_coverage(
@@ -713,7 +695,7 @@ def test_extra_doc_string(self) -> None:
             c = 6
             assert (a,b,c) == (1,3,6)
             """,
-            lines=([1, 3, 6, 7], [1, 2, 3, 4, 5, 6, 7]),
+            lines=[1, 2, 3, 4, 5, 6, 7],
             missing="",
         )