commit 3836d70ed56d4b0f7fab8326470fc8abfe896391
author Ezio Melotti <ezio.melotti@gmail.com> Thu Apr 11 20:29:42 2013 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Thu Apr 11 20:29:42 2013 +0300
tree 70bb83f1230f7915a3b4bb34bcee30f99b3fa6e5
parent 5e2f59314588f4d263fe728ee8ba7da92f3439a0

#17690: test_time now works with unittest test discovery.  Patch by Zachary Ware.

Lib/test/test_time.py

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 0e4d702..18e0568 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -465,10 +465,6 @@
         time.strftime("%B", (2009,2,1,0,0,0,0,0,0))
 
 
-class _BaseYearTest(unittest.TestCase):
-    def yearstr(self, y):
-        raise NotImplementedError()
-
 class _TestAsctimeYear:
     _format = '%d'
 
@@ -526,7 +522,7 @@
     del skip_if_not_supported
 
 
-class _Test4dYear(_BaseYearTest):
+class _Test4dYear:
     _format = '%d'
 
     def test_year(self, fmt=None, func=None):
@@ -559,10 +555,10 @@
         self.assertRaises(OverflowError, self.yearstr, TIME_MINYEAR - 1)
 
 
-class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear):
+class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear, unittest.TestCase):
     pass
 
-class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear):
+class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear, unittest.TestCase):
     pass
 
 
@@ -679,13 +675,6 @@
         self.assertIs(lt.tm_gmtoff, None)
         self.assertIs(lt.tm_zone, None)
 
-def test_main():
-    support.run_unittest(
-        TimeTestCase,
-        TestLocale,
-        TestAsctime4dyear,
-        TestStrftime4dyear,
-        TestPytime)
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()