From: Berker Peksag Date: Fri, 30 Sep 2016 23:44:37 +0000 (+0300) Subject: Issue #28226: Fix test_compileall on Windows X-Git-Tag: v3.6.0b2~79 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8e9713cf1f475ccd5c870a9643d625645870a4c;p=thirdparty%2FPython%2Fcpython.git Issue #28226: Fix test_compileall on Windows --- diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py index 30ca3feee404..2356efcaec78 100644 --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -107,8 +107,7 @@ class CompileallTests(unittest.TestCase): # we should also test the output with support.captured_stdout() as stdout: self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path))) - self.assertEqual(stdout.getvalue(), - "Compiling '{}'...\n".format(self.source_path)) + self.assertRegex(stdout.getvalue(), r'Compiling ([^WindowsPath|PosixPath].*)') self.assertTrue(os.path.isfile(self.bc_path)) def test_compile_file_pathlike_ddir(self): @@ -158,7 +157,8 @@ class CompileallTests(unittest.TestCase): self.assertFalse(os.path.isfile(self.bc_path)) with support.captured_stdout() as stdout: compileall.compile_dir(pathlib.Path(self.directory)) - self.assertIn("Listing '{}'...".format(self.directory), stdout.getvalue()) + line = stdout.getvalue().splitlines()[0] + self.assertRegex(line, r'Listing ([^WindowsPath|PosixPath].*)') self.assertTrue(os.path.isfile(self.bc_path)) @mock.patch('compileall.ProcessPoolExecutor')