diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_importhooks.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_tarfile.py | 21 | ||||
| -rw-r--r-- | Lib/test/test_unittest.py | 15 | ||||
| -rw-r--r-- | Lib/test/test_xml_etree.py | 4 |
4 files changed, 31 insertions, 19 deletions
diff --git a/Lib/test/test_importhooks.py b/Lib/test/test_importhooks.py index 1da30b7..ec6730e 100644 --- a/Lib/test/test_importhooks.py +++ b/Lib/test/test_importhooks.py @@ -221,15 +221,9 @@ class ImportHooksTestCase(ImportHooksBaseTestCase): def testBlocker(self): mname = "exceptions" # an arbitrary harmless builtin module - if mname in sys.modules: - del sys.modules[mname] + support.unload(mname) sys.meta_path.append(ImportBlocker(mname)) - try: - __import__(mname) - except ImportError: - pass - else: - self.fail("'%s' was not supposed to be importable" % mname) + self.assertRaises(ImportError, __import__, mname) def testImpWrapper(self): i = ImpWrapper() diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 89a2583..ff04ef8 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -68,7 +68,7 @@ class UstarReadTest(ReadTest): "fileobj.readlines() failed") self.assertTrue(len(lines2) == 114, "fileobj.readlines() failed") - self.assertTrue(lines2[83] == \ + self.assertTrue(lines2[83] == "I will gladly admit that Python is not the fastest running scripting language.\n", "fileobj.readlines() failed") @@ -706,11 +706,12 @@ class WriteTest(WriteTestBase): name = os.path.join(tempdir, name) open(name, "wb").close() - def exclude(name): - return os.path.isfile(name) + exclude = os.path.isfile tar = tarfile.open(tmpname, self.mode, encoding="iso8859-1") - tar.add(tempdir, arcname="empty_dir", exclude=exclude) + with support.check_warnings(("use the filter argument", + DeprecationWarning)): + tar.add(tempdir, arcname="empty_dir", exclude=exclude) tar.close() tar = tarfile.open(tmpname, "r") @@ -888,10 +889,12 @@ class GNUWriteTest(unittest.TestCase): tar = tarfile.open(tmpname) member = tar.next() - self.assertFalse(member is None, "unable to read longname member") - self.assertTrue(tarinfo.name == member.name and \ - tarinfo.linkname == member.linkname, \ - "unable to read longname member") + self.assertIsNotNone(member, + "unable to read longname member") + self.assertEqual(tarinfo.name, member.name, + "unable to read longname member") + self.assertEqual(tarinfo.linkname, member.linkname, + "unable to read longname member") def test_longname_1023(self): self._test(("longnam/" * 127) + "longnam") @@ -993,7 +996,7 @@ class PaxWriteTest(GNUWriteTest): "test": "\xe4\xf6\xfc", "\xe4\xf6\xfc": "test"} - tar = tarfile.open(tmpname, "w", format=tarfile.PAX_FORMAT, \ + tar = tarfile.open(tmpname, "w", format=tarfile.PAX_FORMAT, pax_headers=pax_headers) tar.addfile(tarfile.TarInfo("test")) tar.close() diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index f24a929..b4716a4 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -291,6 +291,21 @@ class Test_TestLoader(TestCase): suite = loader.loadTestsFromModule(m, use_load_tests=False) self.assertEquals(load_tests_args, []) + def test_loadTestsFromModule__faulty_load_tests(self): + m = types.ModuleType('m') + + def load_tests(loader, tests, pattern): + raise TypeError('some failure') + m.load_tests = load_tests + + loader = unittest.TestLoader() + suite = loader.loadTestsFromModule(m) + self.assertIsInstance(suite, unittest.TestSuite) + self.assertEqual(suite.countTestCases(), 1) + test = list(suite)[0] + + self.assertRaisesRegexp(TypeError, "some failure", test.m) + ################################################################ ### /Tests for TestLoader.loadTestsFromModule() diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 3051540..f1990d1 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -597,8 +597,8 @@ def parsefile(): </ns0:root> >>> parser = ET.XMLParser() - >>> parser.version # XXX: Upgrade to 2.0.1? - 'Expat 2.0.0' + >>> parser.version # doctest: +ELLIPSIS + 'Expat ...' >>> parser.feed(open(SIMPLE_XMLFILE).read()) >>> print(serialize(parser.close())) <root> |