diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/modules/pkg1/__init__.py | 1 | ||||
-rw-r--r-- | tests/test_execfile.py | 13 | ||||
-rw-r--r-- | tests/test_summary.py | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/tests/modules/pkg1/__init__.py b/tests/modules/pkg1/__init__.py index 2dfeb9c1..e2e4af5f 100644 --- a/tests/modules/pkg1/__init__.py +++ b/tests/modules/pkg1/__init__.py @@ -1,3 +1,4 @@ # This __init__.py has a module-level docstring, which is counted as a # statement. """A simple package for testing with.""" +print("pkg1.__init__: %s" % (__name__,)) diff --git a/tests/test_execfile.py b/tests/test_execfile.py index a3ea1153..135240f9 100644 --- a/tests/test_execfile.py +++ b/tests/test_execfile.py @@ -165,22 +165,27 @@ class RunModuleTest(CoverageTest): def test_runmod2(self): run_python_module("pkg1.runmod2", ["runmod2", "hello"]) self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "runmod2: passed hello\n") + self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\nrunmod2: passed hello\n") def test_runmod3(self): run_python_module("pkg1.sub.runmod3", ["runmod3", "hello"]) self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "runmod3: passed hello\n") + self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\nrunmod3: passed hello\n") def test_pkg1_main(self): run_python_module("pkg1", ["pkg1", "hello"]) self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__main__: passed hello\n") + self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.__main__: passed hello\n") def test_pkg1_sub_main(self): run_python_module("pkg1.sub", ["pkg1.sub", "hello"]) self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.sub.__main__: passed hello\n") + self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.sub.__main__: passed hello\n") + + def test_pkg1_init(self): + run_python_module("pkg1.__init__", ["pkg1.__init__", "wut?"]) + self.assertEqual(self.stderr(), "") + self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.__init__: __main__\n") def test_no_such_module(self): with self.assertRaises(NoSource): diff --git a/tests/test_summary.py b/tests/test_summary.py index cc6b3204..cf55130a 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -588,7 +588,7 @@ class SummaryTest2(CoverageTest): report = repout.getvalue().replace('\\', '/') report = re.sub(r"\s+", " ", report) - self.assertIn("tests/modules/pkg1/__init__.py 1 0 100%", report) + self.assertIn("tests/modules/pkg1/__init__.py 2 0 100%", report) self.assertIn("tests/modules/pkg2/__init__.py 0 0 100%", report) |