test: add a test for #1685

nedbat · nedbat · commit 3e011a59b60e · 2023-09-29T14:28:30.000-04:00
Also, analysis.excluded is already a set, so it's faster to use it as-is than to
sort it into a list.  Also also, analysis.missing has already had excluded lines
removed from it, so no need to check it.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -20,7 +20,12 @@ development at the same time, such as 4.5.x and 5.0.
 Unreleased
 ----------
 
-Nothing yet.
+- The ``coverage lcov`` command ignored the ``[report] exclude_lines`` and
+  ``[report] exclude_also`` settings (`issue 1684`_).  This is now fixed,
+  thanks `Jacqueline Lee <pull 1685_>`_.
+
+.. _issue 1684: https://github.com/nedbat/coveragepy/issues/1684
+.. _pull 1685: https://github.com/nedbat/coveragepy/pull/1685
 
 
 .. scriv-start-here
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -98,6 +98,7 @@ Ionel Cristian Mărieș
 Ivan Ciuvalschii
 J. M. F. Tsang
 JT Olds
+Jacqueline Lee
 Jakub Wilk
 Janakarajan Natarajan
 Jerin Peter George
diff --git a/coverage/lcovreport.py b/coverage/lcovreport.py
@@ -62,9 +62,8 @@ def get_lcov(self, fr: FileReporter, analysis: Analysis, outfile: IO[str]) -> No
         outfile.write("TN:\n")
         outfile.write(f"SF:{fr.relative_filename()}\n")
         source_lines = fr.source().splitlines()
-        sorted_excluded = sorted(analysis.excluded)
         for covered in sorted(analysis.executed):
-            if covered in sorted_excluded:
+            if covered in analysis.excluded:
                 # Do not report excluded as executed
                 continue
             # Note: Coverage.py currently only supports checking *if* a line
@@ -85,9 +84,8 @@ def get_lcov(self, fr: FileReporter, analysis: Analysis, outfile: IO[str]) -> No
             outfile.write(f"DA:{covered},1,{line_hash(line)}\n")
 
         for missed in sorted(analysis.missing):
-            if missed in sorted_excluded:
-                # Do not report excluded as missing
-                continue
+            # We don't have to skip excluded lines here, because `missing`
+            # already doesn't have them.
             assert source_lines
             line = source_lines[missed-1]
             outfile.write(f"DA:{missed},0,{line_hash(line)}\n")
diff --git a/tests/test_lcov.py b/tests/test_lcov.py
@@ -279,3 +279,39 @@ def test_empty_init_files(self) -> None:
                 """)
         actual_result = self.get_lcov_report_content()
         assert expected_result == actual_result
+
+    def test_excluded_lines(self) -> None:
+        self.make_file(".coveragerc", """\
+            [report]
+            exclude_lines = foo
+            """)
+        self.make_file("runme.py", """\
+            s = "Hello 1"
+            t = "foo is ignored 2"
+            if s.upper() == "BYE 3":
+                i_am_missing_4()
+                foo_is_missing_5()
+            print("Done 6")
+            # foo 7
+            # line 8
+            """)
+        cov = coverage.Coverage(source=".", branch=True)
+        self.start_import_stop(cov, "runme")
+        cov.lcov_report()
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:runme.py
+            DA:1,1,nWfwsz0pRTEJrInVF+xNvQ
+            DA:3,1,uV4NoIauDo5LCti6agX9sg
+            DA:6,1,+PfQRgSChjQOGkA6MArMDg
+            DA:4,0,GR4ThLStnqpcZvm3alfRaA
+            LF:4
+            LH:3
+            BRDA:4,0,0,-
+            BRDA:6,0,1,1
+            BRF:2
+            BRH:1
+            end_of_record
+            """)
+        actual_result = self.get_lcov_report_content()
+        assert expected_result == actual_result
