diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/datetimetester.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_datetime.py | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index b25e6c1713..bccd97aa3c 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -61,9 +61,8 @@ class TestModule(unittest.TestCase): self.assertEqual(datetime.MAXYEAR, 9999) def test_name_cleanup(self): - if '_Pure' in self.__class__.__name__: - self.skipTest('Only run for Fast C implementation') - + if '_Fast' not in str(self): + return datetime = datetime_module names = set(name for name in dir(datetime) if not name.startswith('__') and not name.endswith('__')) @@ -73,9 +72,8 @@ class TestModule(unittest.TestCase): self.assertEqual(names - allowed, set([])) def test_divide_and_round(self): - if '_Fast' in self.__class__.__name__: - self.skipTest('Only run for Pure Python implementation') - + if '_Fast' in str(self): + return dar = datetime_module._divide_and_round self.assertEqual(dar(-10, -3), 3) @@ -2853,7 +2851,7 @@ class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase): self.assertRaises(TypeError, t.strftime, "%Z") # Issue #6697: - if '_Fast' in self.__class__.__name__: + if '_Fast' in str(self): Badtzname.tz = '\ud800' self.assertRaises(ValueError, t.strftime, "%Z") diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index d659f369d5..04f11c80ec 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -20,7 +20,7 @@ test_suffixes = ["_Pure", "_Fast"] # XXX(gb) First run all the _Pure tests, then all the _Fast tests. You might # not believe this, but in spite of all the sys.modules trickery running a _Pure # test last will leave a mix of pure and native datetime stuff lying around. -all_test_classes = [] +test_classes = [] for module, suffix in zip(test_modules, test_suffixes): test_classes = [] @@ -34,8 +34,7 @@ for module, suffix in zip(test_modules, test_suffixes): test_classes.extend(type(test) for test in suit) test_classes = sorted(set(test_classes), key=lambda cls: cls.__qualname__) for cls in test_classes: - cls.__name__ += suffix - cls.__qualname__ += suffix + cls.__name__ = name + suffix @classmethod def setUpClass(cls_, module=module): cls_._save_sys_modules = sys.modules.copy() @@ -48,10 +47,9 @@ for module, suffix in zip(test_modules, test_suffixes): sys.modules.update(cls_._save_sys_modules) cls.setUpClass = setUpClass cls.tearDownClass = tearDownClass - all_test_classes.extend(test_classes) def test_main(): - run_unittest(*all_test_classes) + run_unittest(*test_classes) if __name__ == "__main__": test_main() |