diff options
author | Éric Araujo <merwok@netwok.org> | 2011-05-28 21:32:50 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-05-28 21:32:50 (GMT) |
commit | 489c8ff26b673553f568266c732182346ee74acf (patch) | |
tree | f7f5469e4be08f2140727ea713f9b0402cd6357f /Lib/distutils | |
parent | f33de715147371c39713a1421fc8bdb01676902f (diff) | |
download | cpython-489c8ff26b673553f568266c732182346ee74acf.zip cpython-489c8ff26b673553f568266c732182346ee74acf.tar.gz cpython-489c8ff26b673553f568266c732182346ee74acf.tar.bz2 |
Fix test_build_py when sys.dont_write_bytecode is true (#9831).
The tests now pass all combinations of -O/-OO and -B. See also #7071
and #6292 for previous variations on the same theme.
test_versionpredicate needs a skip when sys.flags.optimize is true, but
I don’t know how to make that work with a DocTestSuite.
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/tests/test_build_py.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py index da3232c..4e46339 100644 --- a/Lib/distutils/tests/test_build_py.py +++ b/Lib/distutils/tests/test_build_py.py @@ -57,11 +57,15 @@ class BuildPyTestCase(support.TempdirManager, self.assertEqual(len(cmd.get_outputs()), 3) pkgdest = os.path.join(destination, "pkg") files = os.listdir(pkgdest) - self.assertTrue("__init__.py" in files) - self.assertTrue("__init__.pyc" in files) - self.assertTrue("README.txt" in files) - - def test_empty_package_dir (self): + self.assertIn("__init__.py", files) + self.assertIn("README.txt", files) + # XXX even with -O, distutils writes pyc, not pyo; bug? + if sys.dont_write_bytecode: + self.assertNotIn("__init__.pyc", files) + else: + self.assertIn("__init__.pyc", files) + + def test_empty_package_dir(self): # See SF 1668596/1720897. cwd = os.getcwd() @@ -109,7 +113,7 @@ class BuildPyTestCase(support.TempdirManager, finally: sys.dont_write_bytecode = old_dont_write_bytecode - self.assertTrue('byte-compiling is disabled' in self.logs[0][1]) + self.assertIn('byte-compiling is disabled', self.logs[0][1]) def test_suite(): return unittest.makeSuite(BuildPyTestCase) |