cpython: 6a3501aab559 (original) (raw)

Mercurial > cpython

changeset 87161:6a3501aab559

Issue #19600: Use specific asserts in distutils tests. [#19600]

line wrap: on

line diff

--- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -217,7 +217,7 @@ class ArchiveUtilTestCase(support.Tempdi dry_run=True) finally: os.chdir(old_dir)

•    self.assertTrue(not os.path.exists(tarball))[](#l1.7)

•    self.assertFalse(os.path.exists(tarball))[](#l1.8)
     self.assertEqual(len(w.warnings), 1)[](#l1.9)

@unittest.skipUnless(ZIP_SUPPORT and ZLIB_SUPPORT,

--- a/Lib/distutils/tests/test_bdist_rpm.py +++ b/Lib/distutils/tests/test_bdist_rpm.py @@ -81,7 +81,7 @@ class BuildRpmTestCase(support.TempdirMa cmd.run() dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))

•    self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)[](#l2.7)

•    self.assertIn('foo-0.1-1.noarch.rpm', dist_created)[](#l2.8)

# bug #2945: upload ignores bdist_rpm files self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files) @@ -125,7 +125,7 @@ class BuildRpmTestCase(support.TempdirMa cmd.run() dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))

•    self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)[](#l2.16)

•    self.assertIn('foo-0.1-1.noarch.rpm', dist_created)[](#l2.17)

# bug #2945: upload ignores bdist_rpm files self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)

--- a/Lib/distutils/tests/test_bdist_wininst.py +++ b/Lib/distutils/tests/test_bdist_wininst.py @@ -22,7 +22,7 @@ class BuildWinInstTestCase(support.Tempd # and make sure it finds it and returns its content # no matter what platform we have exe_file = cmd.get_exe_bytes()

•    self.assertTrue(len(exe_file) > 10)[](#l3.7)

•    self.assertGreater(len(exe_file), 10)[](#l3.8)

def test_suite(): return unittest.makeSuite(BuildWinInstTestCase)

--- a/Lib/distutils/tests/test_build_clib.py +++ b/Lib/distutils/tests/test_build_clib.py @@ -137,7 +137,7 @@ class BuildCLibTestCase(support.TempdirM cmd.run() # let's check the result

•    self.assertTrue('libfoo.a' in os.listdir(build_temp))[](#l4.7)

•    self.assertIn('libfoo.a', os.listdir(build_temp))[](#l4.8)

def test_suite(): return unittest.makeSuite(BuildCLibTestCase)

--- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -76,8 +76,8 @@ class BuildExtTestCase(TempdirManager, if support.HAVE_DOCSTRINGS: doc = 'This is a template module just for instruction.' self.assertEqual(xx.doc, doc)

•    self.assertTrue(isinstance(xx.Null(), xx.Null))[](#l5.7)

•    self.assertTrue(isinstance(xx.Str(), xx.Str))[](#l5.8)

•    self.assertIsInstance(xx.Null(), xx.Null)[](#l5.9)

•    self.assertIsInstance(xx.Str(), xx.Str)[](#l5.10)

def tearDown(self): # Get everything back to normal @@ -110,7 +110,7 @@ class BuildExtTestCase(TempdirManager, _config_vars['Py_ENABLE_SHARED'] = old_var # make sure we get some library dirs under solaris

•    self.assertTrue(len(cmd.library_dirs) > 0)[](#l5.18)

•    self.assertGreater(len(cmd.library_dirs), 0)[](#l5.19)

def test_user_site(self): # site.USER_SITE was introduced in 2.6 @@ -124,7 +124,7 @@ class BuildExtTestCase(TempdirManager, # making sure the user option is there options = [name for name, short, lable in cmd.user_options]

•    self.assertTrue('user' in options)[](#l5.27)

•    self.assertIn('user', options)[](#l5.28)

# setting a value cmd.user = 1 @@ -171,10 +171,10 @@ class BuildExtTestCase(TempdirManager, from distutils import sysconfig py_include = sysconfig.get_python_inc()

•    self.assertTrue(py_include in cmd.include_dirs)[](#l5.36)

•    self.assertIn(py_include, cmd.include_dirs)[](#l5.37)

plat_py_include = sysconfig.get_python_inc(plat_specific=1)

•    self.assertTrue(plat_py_include in cmd.include_dirs)[](#l5.40)

•    self.assertIn(plat_py_include, cmd.include_dirs)[](#l5.41)

# make sure cmd.libraries is turned into a list # if it's a string @@ -255,13 +255,13 @@ class BuildExtTestCase(TempdirManager, 'some': 'bar'})] cmd.check_extensions_list(exts) ext = exts[0]

•    self.assertTrue(isinstance(ext, Extension))[](#l5.49)

•    self.assertIsInstance(ext, Extension)[](#l5.50)

# check_extensions_list adds in ext the values passed # when they are in ('include_dirs', 'library_dirs', 'libraries' # 'extra_objects', 'extra_compile_args', 'extra_link_args') self.assertEqual(ext.libraries, 'foo')

•    self.assertTrue(not hasattr(ext, 'some'))[](#l5.56)

•    self.assertFalse(hasattr(ext, 'some'))[](#l5.57)

# 'macros' element of build info dict must be 1- or 2-tuple exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',

--- a/Lib/distutils/tests/test_build_scripts.py +++ b/Lib/distutils/tests/test_build_scripts.py @@ -17,8 +17,8 @@ class BuildScriptsTestCase(support.Tempd def test_default_settings(self): cmd = self.get_build_scripts_cmd("/foo/bar", [])

•    self.assertTrue(not cmd.force)[](#l6.7)

•    self.assertTrue(cmd.build_dir is None)[](#l6.8)

•    self.assertFalse(cmd.force)[](#l6.9)

•    self.assertIsNone(cmd.build_dir)[](#l6.10)

cmd.finalize_options() @@ -38,7 +38,7 @@ class BuildScriptsTestCase(support.Tempd built = os.listdir(target) for name in expected:

•        self.assertTrue(name in built)[](#l6.18)

•        self.assertIn(name, built)[](#l6.19)

def get_build_scripts_cmd(self, target, scripts): import sys @@ -103,7 +103,7 @@ class BuildScriptsTestCase(support.Tempd built = os.listdir(target) for name in expected:

•        self.assertTrue(name in built)[](#l6.27)

•        self.assertIn(name, built)[](#l6.28)

def test_suite(): return unittest.makeSuite(BuildScriptsTestCase)

--- a/Lib/distutils/tests/test_clean.py +++ b/Lib/distutils/tests/test_clean.py @@ -36,7 +36,7 @@ class cleanTestCase(support.TempdirManag # make sure the files where removed for name, path in dirs:

•        self.assertTrue(not os.path.exists(path),[](#l7.7)

•        self.assertFalse(os.path.exists(path),[](#l7.8)
                      '%s was not removed' % path)[](#l7.9)

# let's run the command again (should spit warnings but succeed)

--- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -103,7 +103,7 @@ class PyPIRCCommandTestCase(support.Temp def test_server_empty_registration(self): cmd = self._cmd(self.dist) rc = cmd._get_rc_file()

•    self.assertTrue(not os.path.exists(rc))[](#l8.7)

•    self.assertFalse(os.path.exists(rc))[](#l8.8)
     cmd._store_pypirc('tarek', 'xxx')[](#l8.9)
     self.assertTrue(os.path.exists(rc))[](#l8.10)
     f = open(rc)[](#l8.11)

--- a/Lib/distutils/tests/test_config_cmd.py +++ b/Lib/distutils/tests/test_config_cmd.py @@ -81,7 +81,7 @@ class ConfigTestCase(support.LoggingSile cmd._clean(f1, f2) for f in (f1, f2):

•        self.assertTrue(not os.path.exists(f))[](#l9.7)

•        self.assertFalse(os.path.exists(f))[](#l9.8)

def test_suite(): return unittest.makeSuite(ConfigTestCase)

--- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -236,7 +236,7 @@ class InstallTestCase(support.TempdirMan self.test_record() finally: install_module.DEBUG = False

•    self.assertTrue(len(self.logs) > old_logs_len)[](#l10.7)

•    self.assertGreater(len(self.logs), old_logs_len)[](#l10.8)

def test_suite():

--- a/Lib/distutils/tests/test_install_lib.py +++ b/Lib/distutils/tests/test_install_lib.py @@ -105,7 +105,7 @@ class InstallLibTestCase(support.Tempdir finally: sys.dont_write_bytecode = old_dont_write_bytecode

•    self.assertTrue('byte-compiling is disabled' in self.logs[0][1])[](#l11.7)

•    self.assertIn('byte-compiling is disabled', self.logs[0][1])[](#l11.8)

def test_suite():

--- a/Lib/distutils/tests/test_install_scripts.py +++ b/Lib/distutils/tests/test_install_scripts.py @@ -24,10 +24,10 @@ class InstallScriptsTestCase(support.Tem skip_build=1, ) cmd = install_scripts(dist)

•    self.assertTrue(not cmd.force)[](#l12.7)

•    self.assertTrue(not cmd.skip_build)[](#l12.8)

•    self.assertTrue(cmd.build_dir is None)[](#l12.9)

•    self.assertTrue(cmd.install_dir is None)[](#l12.10)

•    self.assertFalse(cmd.force)[](#l12.11)

•    self.assertFalse(cmd.skip_build)[](#l12.12)

•    self.assertIsNone(cmd.build_dir)[](#l12.13)

•    self.assertIsNone(cmd.install_dir)[](#l12.14)

cmd.finalize_options() @@ -72,7 +72,7 @@ class InstallScriptsTestCase(support.Tem installed = os.listdir(target) for name in expected:

•        self.assertTrue(name in installed)[](#l12.22)

•        self.assertIn(name, installed)[](#l12.23)

def test_suite():

--- a/Lib/distutils/tests/test_msvc9compiler.py +++ b/Lib/distutils/tests/test_msvc9compiler.py @@ -128,7 +128,7 @@ class msvc9compilerTestCase(support.Temp # windows registeries versions. path = r'Control Panel\Desktop' v = Reg.get_value(path, 'dragfullwindows')

•    self.assertTrue(v in ('0', '1', '2'))[](#l13.7)

•    self.assertIn(v, ('0', '1', '2'))[](#l13.8)

import winreg HKCU = winreg.HKEY_CURRENT_USER @@ -136,7 +136,7 @@ class msvc9compilerTestCase(support.Temp self.assertEqual(keys, None) keys = Reg.read_keys(HKCU, r'Control Panel')

•    self.assertTrue('Desktop' in keys)[](#l13.16)

•    self.assertIn('Desktop', keys)[](#l13.17)

def test_remove_visual_c_ref(self): from distutils.msvc9compiler import MSVCCompiler @@ -174,7 +174,7 @@ class msvc9compilerTestCase(support.Temp compiler = MSVCCompiler() got = compiler._remove_visual_c_ref(manifest)

•    self.assertIs(got, None)[](#l13.25)

•    self.assertIsNone(got)[](#l13.26)

def test_suite():

--- a/Lib/distutils/tests/test_register.py +++ b/Lib/distutils/tests/test_register.py @@ -98,7 +98,7 @@ class RegisterTestCase(PyPIRCCommandTest cmd = self._get_cmd() # we shouldn't have a .pypirc file yet

•    self.assertTrue(not os.path.exists(self.rc))[](#l14.7)

•    self.assertFalse(os.path.exists(self.rc))[](#l14.8)

# patching input and getpass.getpass # so register gets happy @@ -145,7 +145,7 @@ class RegisterTestCase(PyPIRCCommandTest self.assertEqual(req1['Content-length'], '1374') self.assertEqual(req2['Content-length'], '1374')

•    self.assertTrue((b'xxx') in self.conn.reqs[1].data)[](#l14.16)

•    self.assertIn(b'xxx', self.conn.reqs[1].data)[](#l14.17)

def test_password_not_in_file(self): @@ -175,7 +175,7 @@ class RegisterTestCase(PyPIRCCommandTest req = self.conn.reqs[0] headers = dict(req.headers) self.assertEqual(headers['Content-length'], '608')

•    self.assertTrue((b'tarek') in req.data)[](#l14.25)

•    self.assertIn(b'tarek', req.data)[](#l14.26)

def test_password_reset(self): # this test runs choice 3 @@ -193,7 +193,7 @@ class RegisterTestCase(PyPIRCCommandTest req = self.conn.reqs[0] headers = dict(req.headers) self.assertEqual(headers['Content-length'], '290')

•    self.assertTrue((b'tarek') in req.data)[](#l14.34)

•    self.assertIn(b'tarek', req.data)[](#l14.35)

@unittest.skipUnless(docutils is not None, 'needs docutils') def test_strict(self):

--- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -50,7 +50,7 @@ class SysconfigTestCase(support.EnvironG def test_get_config_vars(self): cvars = sysconfig.get_config_vars()

•    self.assertTrue(isinstance(cvars, dict))[](#l15.7)

•    self.assertIsInstance(cvars, dict)[](#l15.8)
     self.assertTrue(cvars)[](#l15.9)

def test_srcdir(self):

--- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -266,7 +266,7 @@ class UtilTestCase(support.EnvironGuard, self.assertTrue(strtobool(y)) for n in no:

•        self.assertTrue(not strtobool(n))[](#l16.7)

•        self.assertFalse(strtobool(n))[](#l16.8)

def test_rfc822_escape(self): header = 'I am a\npoor\nlonesome\nheader\n'