From 80c021d9174e7ae3e5183f1902903fb90a891246 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 2 Feb 2021 09:12:47 -0500 Subject: refactor: remove reliance on unittest_mixins.StdStreamCapturingMixin This is another step toward removing unittest.TestCase as a base class. --- tests/test_execfile.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'tests/test_execfile.py') diff --git a/tests/test_execfile.py b/tests/test_execfile.py index db78d0f6..d221f2d3 100644 --- a/tests/test_execfile.py +++ b/tests/test_execfile.py @@ -193,33 +193,39 @@ class RunModuleTest(UsingModulesMixin, CoverageTest): def test_runmod1(self): run_python_module(["runmod1", "hello"]) - assert self.stderr() == "" - assert self.stdout() == "runmod1: passed hello\n" + out, err = self.stdouterr() + assert out == "runmod1: passed hello\n" + assert err == "" def test_runmod2(self): run_python_module(["pkg1.runmod2", "hello"]) - assert self.stderr() == "" - assert self.stdout() == "pkg1.__init__: pkg1\nrunmod2: passed hello\n" + out, err = self.stdouterr() + assert out == "pkg1.__init__: pkg1\nrunmod2: passed hello\n" + assert err == "" def test_runmod3(self): run_python_module(["pkg1.sub.runmod3", "hello"]) - assert self.stderr() == "" - assert self.stdout() == "pkg1.__init__: pkg1\nrunmod3: passed hello\n" + out, err = self.stdouterr() + assert out == "pkg1.__init__: pkg1\nrunmod3: passed hello\n" + assert err == "" def test_pkg1_main(self): run_python_module(["pkg1", "hello"]) - assert self.stderr() == "" - assert self.stdout() == "pkg1.__init__: pkg1\npkg1.__main__: passed hello\n" + out, err = self.stdouterr() + assert out == "pkg1.__init__: pkg1\npkg1.__main__: passed hello\n" + assert err == "" def test_pkg1_sub_main(self): run_python_module(["pkg1.sub", "hello"]) - assert self.stderr() == "" - assert self.stdout() == "pkg1.__init__: pkg1\npkg1.sub.__main__: passed hello\n" + out, err = self.stdouterr() + assert out == "pkg1.__init__: pkg1\npkg1.sub.__main__: passed hello\n" + assert err == "" def test_pkg1_init(self): run_python_module(["pkg1.__init__", "wut?"]) - assert self.stderr() == "" - assert self.stdout() == "pkg1.__init__: pkg1\npkg1.__init__: __main__\n" + out, err = self.stdouterr() + assert out == "pkg1.__init__: pkg1\npkg1.__init__: __main__\n" + assert err == "" def test_no_such_module(self): with pytest.raises(NoSource, match="No module named '?i_dont_exist'?"): -- cgit v1.2.1