style: cleanups after lcov, though more than just lcov

1 files changed, 121 insertions, 154 deletions

diff --git a/tests/test_lcov.py b/tests/test_lcov.py
index fcb17f93..f31d8c17 100644
--- a/tests/test_lcov.py
+++ b/tests/test_lcov.py
@@ -4,10 +4,11 @@
 """Test LCOV-based summary reporting for coverage.py."""
 
 import textwrap
-import coverage
 
 from tests.coveragetest import CoverageTest
 
+import coverage
+
 
 class LcovTest(CoverageTest):
     """Tests of the LCOV reports from coverage.py."""
@@ -17,9 +18,7 @@ class LcovTest(CoverageTest):
         Helper for tests that handles the common ceremony so the tests can
         show the consequences of changes in the setup.
         """
-        self.make_file(
-            "main_file.py",
-            """\
+        self.make_file("main_file.py", """\
             #!/usr/bin/env python3
 
             def cuboid_volume(l):
@@ -27,13 +26,9 @@ class LcovTest(CoverageTest):
 
             def IsItTrue():
                 return True
+            """)
 
-        """,
-        )
-
-        self.make_file(
-            "test_file.py",
-            """\
+        self.make_file("test_file.py", """\
             #!/usr/bin/env python3
 
             from main_file import cuboid_volume
@@ -45,9 +40,7 @@ class LcovTest(CoverageTest):
                     self.assertAlmostEqual(cuboid_volume(1),1)
                     self.assertAlmostEqual(cuboid_volume(0),0)
                     self.assertAlmostEqual(cuboid_volume(5.5),166.375)
-
-        """,
-        )
+            """)
 
     def get_lcov_report_content(self, filename="coverage.lcov"):
         """Return the content of an LCOV report."""
@@ -58,9 +51,7 @@ class LcovTest(CoverageTest):
     def test_lone_file(self):
         """For a single file with a couple of functions, the lcov should cover
         the function definitions themselves, but not the returns."""
-        self.make_file(
-            "main_file.py",
-            """\
+        self.make_file("main_file.py", """\
             #!/usr/bin/env python3
 
             def cuboid_volume(l):
@@ -68,21 +59,18 @@ class LcovTest(CoverageTest):
 
             def IsItTrue():
                 return True
-
-        """,
-        )
-        expected_result = """\
-        TN:
-        SF:main_file.py
-        DA:3,1,7URou3io0zReBkk69lEb/Q
-        DA:6,1,ilhb4KUfytxtEuClijZPlQ
-        DA:4,0,Xqj6H1iz/nsARMCAbE90ng
-        DA:7,0,LWILTcvARcydjFFyo9qM0A
-        LF:4
-        LH:2
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+            """)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:main_file.py
+            DA:3,1,7URou3io0zReBkk69lEb/Q
+            DA:6,1,ilhb4KUfytxtEuClijZPlQ
+            DA:4,0,Xqj6H1iz/nsARMCAbE90ng
+            DA:7,0,LWILTcvARcydjFFyo9qM0A
+            LF:4
+            LH:2
+            end_of_record
+            """)
         self.assert_doesnt_exist(".coverage")
         cov = coverage.Coverage(source=["."])
         self.start_import_stop(cov, "main_file")
@@ -100,39 +88,36 @@ class LcovTest(CoverageTest):
         self.start_import_stop(cov, "test_file")
         cov.lcov_report()
         self.assert_exists("data.lcov")
-        expected_result = """\
-        TN:
-        SF:main_file.py
-        DA:3,1,7URou3io0zReBkk69lEb/Q
-        DA:6,1,ilhb4KUfytxtEuClijZPlQ
-        DA:4,0,Xqj6H1iz/nsARMCAbE90ng
-        DA:7,0,LWILTcvARcydjFFyo9qM0A
-        LF:4
-        LH:2
-        end_of_record
-        TN:
-        SF:test_file.py
-        DA:3,1,R5Rb4IzmjKRgY/vFFc1TRg
-        DA:4,1,E/tvV9JPVDhEcTCkgrwOFw
-        DA:6,1,GP08LPBYJq8EzYveHJy2qA
-        DA:7,1,MV+jSLi6PFEl+WatEAptog
-        DA:8,0,qyqd1mF289dg6oQAQHA+gQ
-        DA:9,0,nmEYd5F1KrxemgC9iVjlqg
-        DA:10,0,jodMK26WYDizOO1C7ekBbg
-        DA:11,0,LtxfKehkX8o4KvC5GnN52g
-        LF:8
-        LH:4
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:main_file.py
+            DA:3,1,7URou3io0zReBkk69lEb/Q
+            DA:6,1,ilhb4KUfytxtEuClijZPlQ
+            DA:4,0,Xqj6H1iz/nsARMCAbE90ng
+            DA:7,0,LWILTcvARcydjFFyo9qM0A
+            LF:4
+            LH:2
+            end_of_record
+            TN:
+            SF:test_file.py
+            DA:3,1,R5Rb4IzmjKRgY/vFFc1TRg
+            DA:4,1,E/tvV9JPVDhEcTCkgrwOFw
+            DA:6,1,GP08LPBYJq8EzYveHJy2qA
+            DA:7,1,MV+jSLi6PFEl+WatEAptog
+            DA:8,0,qyqd1mF289dg6oQAQHA+gQ
+            DA:9,0,nmEYd5F1KrxemgC9iVjlqg
+            DA:10,0,jodMK26WYDizOO1C7ekBbg
+            DA:11,0,LtxfKehkX8o4KvC5GnN52g
+            LF:8
+            LH:4
+            end_of_record
+            """)
         actual_result = self.get_lcov_report_content(filename="data.lcov")
         assert expected_result == actual_result
 
     def test_branch_coverage_one_file(self):
         """Test that the reporter produces valid branch coverage."""
-        self.make_file(
-            "main_file.py",
-            """\
+        self.make_file("main_file.py", """\
             #!/usr/bin/env python3
 
             def is_it_x(x):
@@ -140,39 +125,34 @@ class LcovTest(CoverageTest):
                     return x
                 else:
                     return False
-
-            """,
-        )
+            """)
         self.assert_doesnt_exist(".coverage")
         cov = coverage.Coverage(branch=True, source=".")
         self.start_import_stop(cov, "main_file")
         cov.lcov_report()
         self.assert_exists("coverage.lcov")
-        expected_result = """\
-        TN:
-        SF:main_file.py
-        DA:3,1,4MDXMbvwQ3L7va1tsphVzw
-        DA:4,0,MuERA6EYyZNpKPqoJfzwkA
-        DA:5,0,sAyiiE6iAuPMte9kyd0+3g
-        DA:7,0,W/g8GJDAYJkSSurt59Mzfw
-        LF:4
-        LH:1
-        BRDA:5,0,0,-
-        BRDA:7,0,1,-
-        BRF:2
-        BRH:0
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:main_file.py
+            DA:3,1,4MDXMbvwQ3L7va1tsphVzw
+            DA:4,0,MuERA6EYyZNpKPqoJfzwkA
+            DA:5,0,sAyiiE6iAuPMte9kyd0+3g
+            DA:7,0,W/g8GJDAYJkSSurt59Mzfw
+            LF:4
+            LH:1
+            BRDA:5,0,0,-
+            BRDA:7,0,1,-
+            BRF:2
+            BRH:0
+            end_of_record
+            """)
         actual_result = self.get_lcov_report_content()
         assert expected_result == actual_result
 
     def test_branch_coverage_two_files(self):
         """Test that valid branch coverage is generated
         in the case of two files."""
-        self.make_file(
-            "main_file.py",
-            """\
+        self.make_file("main_file.py", """\
             #!/usr/bin/env python3
 
             def is_it_x(x):
@@ -180,13 +160,9 @@ class LcovTest(CoverageTest):
                     return x
                 else:
                     return False
+            """)
 
-            """,
-        )
-
-        self.make_file(
-            "test_file.py",
-            """\
+        self.make_file("test_file.py", """\
             #!/usr/bin/env python3
 
             from main_file import *
@@ -196,45 +172,42 @@ class LcovTest(CoverageTest):
                 def test_is_it_x(self):
                     self.assertEqual(is_it_x(3), 3)
                     self.assertEqual(is_it_x(4), False)
-
-            """,
-        )
+            """)
         self.assert_doesnt_exist(".coverage")
         cov = coverage.Coverage(branch=True, source=".")
         self.start_import_stop(cov, "test_file")
         cov.lcov_report()
         self.assert_exists("coverage.lcov")
-        expected_result = """\
-        TN:
-        SF:main_file.py
-        DA:3,1,4MDXMbvwQ3L7va1tsphVzw
-        DA:4,0,MuERA6EYyZNpKPqoJfzwkA
-        DA:5,0,sAyiiE6iAuPMte9kyd0+3g
-        DA:7,0,W/g8GJDAYJkSSurt59Mzfw
-        LF:4
-        LH:1
-        BRDA:5,0,0,-
-        BRDA:7,0,1,-
-        BRF:2
-        BRH:0
-        end_of_record
-        TN:
-        SF:test_file.py
-        DA:3,1,9TxKIyoBtmhopmlbDNa8FQ
-        DA:4,1,E/tvV9JPVDhEcTCkgrwOFw
-        DA:6,1,C3s/c8C1Yd/zoNG1GnGexg
-        DA:7,1,9qPyWexYysgeKtB+YvuzAg
-        DA:8,0,LycuNcdqoUhPXeuXUTf5lA
-        DA:9,0,FPTWzd68bDx76HN7VHu1wA
-        LF:6
-        LH:4
-        BRDA:0,0,0,1
-        BRDA:7,0,1,1
-        BRF:2
-        BRH:2
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:main_file.py
+            DA:3,1,4MDXMbvwQ3L7va1tsphVzw
+            DA:4,0,MuERA6EYyZNpKPqoJfzwkA
+            DA:5,0,sAyiiE6iAuPMte9kyd0+3g
+            DA:7,0,W/g8GJDAYJkSSurt59Mzfw
+            LF:4
+            LH:1
+            BRDA:5,0,0,-
+            BRDA:7,0,1,-
+            BRF:2
+            BRH:0
+            end_of_record
+            TN:
+            SF:test_file.py
+            DA:3,1,9TxKIyoBtmhopmlbDNa8FQ
+            DA:4,1,E/tvV9JPVDhEcTCkgrwOFw
+            DA:6,1,C3s/c8C1Yd/zoNG1GnGexg
+            DA:7,1,9qPyWexYysgeKtB+YvuzAg
+            DA:8,0,LycuNcdqoUhPXeuXUTf5lA
+            DA:9,0,FPTWzd68bDx76HN7VHu1wA
+            LF:6
+            LH:4
+            BRDA:0,0,0,1
+            BRDA:7,0,1,1
+            BRF:2
+            BRH:2
+            end_of_record
+            """)
         actual_result = self.get_lcov_report_content()
         assert actual_result == expected_result
 
@@ -242,39 +215,34 @@ class LcovTest(CoverageTest):
         """Test that for a given branch that is only half covered,
         the block numbers remain the same, and produces valid lcov.
         """
-        self.make_file(
-            "main_file.py",
-            """\
+        self.make_file("main_file.py", """\
             something = True
 
             if something:
                 print("Yes, something")
             else:
                 print("No, nothing")
-
-            """,
-        )
+            """)
         self.assert_doesnt_exist(".coverage")
         cov = coverage.Coverage(branch=True, source=".")
         self.start_import_stop(cov, "main_file")
         cov.lcov_report()
         self.assert_exists("coverage.lcov")
-        expected_result = """\
-        TN:
-        SF:main_file.py
-        DA:1,1,N4kbVOlkNI1rqOfCArBClw
-        DA:3,1,CmlqqPf0/H+R/p7/PLEXZw
-        DA:4,1,rE3mWnpoMq2W2sMETVk/uQ
-        DA:6,0,+Aov7ekIts7C96udNDVIIQ
-        LF:4
-        LH:3
-        BRDA:6,0,0,-
-        BRDA:4,0,1,1
-        BRF:2
-        BRH:1
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:main_file.py
+            DA:1,1,N4kbVOlkNI1rqOfCArBClw
+            DA:3,1,CmlqqPf0/H+R/p7/PLEXZw
+            DA:4,1,rE3mWnpoMq2W2sMETVk/uQ
+            DA:6,0,+Aov7ekIts7C96udNDVIIQ
+            LF:4
+            LH:3
+            BRDA:6,0,0,-
+            BRDA:4,0,1,1
+            BRF:2
+            BRH:1
+            end_of_record
+            """)
         actual_result = self.get_lcov_report_content()
         assert actual_result == expected_result
 
@@ -293,16 +261,15 @@ class LcovTest(CoverageTest):
         self.start_import_stop(cov, "__init__")
         cov.lcov_report()
         self.assert_exists("coverage.lcov")
-        expected_result = """\
-        TN:
-        SF:__init__.py
-        DA:1,1,1B2M2Y8AsgTpgAmY7PhCfg
-        LF:0
-        LH:1
-        BRF:0
-        BRH:0
-        end_of_record
-        """
-        expected_result = textwrap.dedent(expected_result)
+        expected_result = textwrap.dedent("""\
+            TN:
+            SF:__init__.py
+            DA:1,1,1B2M2Y8AsgTpgAmY7PhCfg
+            LF:0
+            LH:1
+            BRF:0
+            BRH:0
+            end_of_record
+            """)
         actual_result = self.get_lcov_report_content()
         assert actual_result == expected_result