diff options
Diffstat (limited to 'tests/test_execfile.py')
| -rw-r--r-- | tests/test_execfile.py | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/tests/test_execfile.py b/tests/test_execfile.py index 5a718aae..b740d2df 100644 --- a/tests/test_execfile.py +++ b/tests/test_execfile.py @@ -18,6 +18,7 @@ from coverage.files import python_reported_file from coverage.misc import NoCode, NoSource from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin +import pytest TRY_EXECFILE = os.path.join(TESTS_DIR, "modules/process_test/try_execfile.py") @@ -30,27 +31,27 @@ class RunFileTest(CoverageTest): mod_globs = json.loads(self.stdout()) # The file should think it is __main__ - self.assertEqual(mod_globs['__name__'], "__main__") + assert mod_globs['__name__'] == "__main__" # It should seem to come from a file named try_execfile.py dunder_file = os.path.basename(mod_globs['__file__']) - self.assertEqual(dunder_file, "try_execfile.py") + assert dunder_file == "try_execfile.py" # It should have its correct module data. - self.assertEqual(mod_globs['__doc__'].splitlines()[0], - "Test file for run_python_file.") - self.assertEqual(mod_globs['DATA'], "xyzzy") - self.assertEqual(mod_globs['FN_VAL'], "my_fn('fooey')") + assert mod_globs['__doc__'].splitlines()[0] == \ + "Test file for run_python_file." + assert mod_globs['DATA'] == "xyzzy" + assert mod_globs['FN_VAL'] == "my_fn('fooey')" # It must be self-importable as __main__. - self.assertEqual(mod_globs['__main__.DATA'], "xyzzy") + assert mod_globs['__main__.DATA'] == "xyzzy" # Argv should have the proper values. - self.assertEqual(mod_globs['argv0'], TRY_EXECFILE) - self.assertEqual(mod_globs['argv1-n'], ["arg1", "arg2"]) + assert mod_globs['argv0'] == TRY_EXECFILE + assert mod_globs['argv1-n'] == ["arg1", "arg2"] # __builtins__ should have the right values, like open(). - self.assertEqual(mod_globs['__builtins__.has_open'], True) + assert mod_globs['__builtins__.has_open'] == True def test_no_extra_file(self): # Make sure that running a file doesn't create an extra compiled file. @@ -58,9 +59,9 @@ class RunFileTest(CoverageTest): desc = "a non-.py file!" """) - self.assertEqual(os.listdir("."), ["xxx"]) + assert os.listdir(".") == ["xxx"] run_python_file(["xxx"]) - self.assertEqual(os.listdir("."), ["xxx"]) + assert os.listdir(".") == ["xxx"] def test_universal_newlines(self): # Make sure we can read any sort of line ending. @@ -69,7 +70,7 @@ class RunFileTest(CoverageTest): with open('nl.py', 'wb') as fpy: fpy.write(nl.join(pylines).encode('utf-8')) run_python_file(['nl.py']) - self.assertEqual(self.stdout(), "Hello, world!\n"*3) + assert self.stdout() == "Hello, world!\n"*3 def test_missing_final_newline(self): # Make sure we can deal with a Python file with no final newline. @@ -80,14 +81,14 @@ class RunFileTest(CoverageTest): #""") with open("abrupt.py") as f: abrupt = f.read() - self.assertEqual(abrupt[-1], '#') + assert abrupt[-1] == '#' run_python_file(["abrupt.py"]) - self.assertEqual(self.stdout(), "a is 1\n") + assert self.stdout() == "a is 1\n" def test_no_such_file(self): path = python_reported_file('xyzzy.py') msg = re.escape("No file to run: '{}'".format(path)) - with self.assertRaisesRegex(NoSource, msg): + with pytest.raises(NoSource, match=msg): run_python_file(["xyzzy.py"]) def test_directory_with_main(self): @@ -95,11 +96,11 @@ class RunFileTest(CoverageTest): print("I am __main__") """) run_python_file(["with_main"]) - self.assertEqual(self.stdout(), "I am __main__\n") + assert self.stdout() == "I am __main__\n" def test_directory_without_main(self): self.make_file("without_main/__init__.py", "") - with self.assertRaisesRegex(NoSource, "Can't find '__main__' module in 'without_main'"): + with pytest.raises(NoSource, match="Can't find '__main__' module in 'without_main'"): run_python_file(["without_main"]) @@ -134,15 +135,15 @@ class RunPycFileTest(CoverageTest): def test_running_pyc(self): pycfile = self.make_pyc() run_python_file([pycfile]) - self.assertEqual(self.stdout(), "I am here!\n") + assert self.stdout() == "I am here!\n" def test_running_pyo(self): pycfile = self.make_pyc() pyofile = re.sub(r"[.]pyc$", ".pyo", pycfile) - self.assertNotEqual(pycfile, pyofile) + assert pycfile != pyofile os.rename(pycfile, pyofile) run_python_file([pyofile]) - self.assertEqual(self.stdout(), "I am here!\n") + assert self.stdout() == "I am here!\n" def test_running_pyc_from_wrong_python(self): pycfile = self.make_pyc() @@ -152,7 +153,7 @@ class RunPycFileTest(CoverageTest): fpyc.seek(0) fpyc.write(binary_bytes([0x2a, 0xeb, 0x0d, 0x0a])) - with self.assertRaisesRegex(NoCode, "Bad magic number in .pyc file"): + with pytest.raises(NoCode, match="Bad magic number in .pyc file"): run_python_file([pycfile]) # In some environments, the pycfile persists and pollutes another test. @@ -161,7 +162,7 @@ class RunPycFileTest(CoverageTest): def test_no_such_pyc_file(self): path = python_reported_file('xyzzy.pyc') msg = re.escape("No file to run: '{}'".format(path)) - with self.assertRaisesRegex(NoCode, msg): + with pytest.raises(NoCode, match=msg): run_python_file(["xyzzy.pyc"]) def test_running_py_from_binary(self): @@ -181,7 +182,7 @@ class RunPycFileTest(CoverageTest): r"source code string cannot contain null bytes" # for py3 r")" ) - with self.assertRaisesRegex(Exception, msg): + with pytest.raises(Exception, match=msg): run_python_file([bf]) @@ -192,42 +193,42 @@ class RunModuleTest(UsingModulesMixin, CoverageTest): def test_runmod1(self): run_python_module(["runmod1", "hello"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "runmod1: passed hello\n") + assert self.stderr() == "" + assert self.stdout() == "runmod1: passed hello\n" def test_runmod2(self): run_python_module(["pkg1.runmod2", "hello"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\nrunmod2: passed hello\n") + assert self.stderr() == "" + assert self.stdout() == "pkg1.__init__: pkg1\nrunmod2: passed hello\n" def test_runmod3(self): run_python_module(["pkg1.sub.runmod3", "hello"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\nrunmod3: passed hello\n") + assert self.stderr() == "" + assert self.stdout() == "pkg1.__init__: pkg1\nrunmod3: passed hello\n" def test_pkg1_main(self): run_python_module(["pkg1", "hello"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.__main__: passed hello\n") + assert self.stderr() == "" + assert self.stdout() == "pkg1.__init__: pkg1\npkg1.__main__: passed hello\n" def test_pkg1_sub_main(self): run_python_module(["pkg1.sub", "hello"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.sub.__main__: passed hello\n") + assert self.stderr() == "" + assert self.stdout() == "pkg1.__init__: pkg1\npkg1.sub.__main__: passed hello\n" def test_pkg1_init(self): run_python_module(["pkg1.__init__", "wut?"]) - self.assertEqual(self.stderr(), "") - self.assertEqual(self.stdout(), "pkg1.__init__: pkg1\npkg1.__init__: __main__\n") + assert self.stderr() == "" + assert self.stdout() == "pkg1.__init__: pkg1\npkg1.__init__: __main__\n" def test_no_such_module(self): - with self.assertRaisesRegex(NoSource, "No module named '?i_dont_exist'?"): + with pytest.raises(NoSource, match="No module named '?i_dont_exist'?"): run_python_module(["i_dont_exist"]) - with self.assertRaisesRegex(NoSource, "No module named '?i'?"): + with pytest.raises(NoSource, match="No module named '?i'?"): run_python_module(["i.dont_exist"]) - with self.assertRaisesRegex(NoSource, "No module named '?i'?"): + with pytest.raises(NoSource, match="No module named '?i'?"): run_python_module(["i.dont.exist"]) def test_no_main(self): - with self.assertRaises(NoSource): + with pytest.raises(NoSource): run_python_module(["pkg2", "hi"]) |