From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 8 Aug 2013 16:36:36 +0000 (+0300)
Subject: #18581: remove duplicate test and run a test class that was skipped.  Initial patch... 
X-Git-Tag: v3.4.0a2~275^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e4f3b8d353803003c5f114a29f3b0ab1596fe24;p=thirdparty%2FPython%2Fcpython.git

#18581: remove duplicate test and run a test class that was skipped.  Initial patch by Vajrasky Kok.
---

diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 653c957b814a..d4d755651866 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -65,34 +65,6 @@ class TestLegacyAPI(unittest.TestCase):
         self.assertEqual(D.foo(), 4)
         self.assertEqual(D().foo(), 4)
 
-    def test_abstractmethod_integration(self):
-        for abstractthing in [abc.abstractmethod, abc.abstractproperty,
-                              abc.abstractclassmethod,
-                              abc.abstractstaticmethod]:
-            class C(metaclass=abc.ABCMeta):
-                @abstractthing
-                def foo(self): pass  # abstract
-                def bar(self): pass  # concrete
-            self.assertEqual(C.__abstractmethods__, {"foo"})
-            self.assertRaises(TypeError, C)  # because foo is abstract
-            self.assertTrue(isabstract(C))
-            class D(C):
-                def bar(self): pass  # concrete override of concrete
-            self.assertEqual(D.__abstractmethods__, {"foo"})
-            self.assertRaises(TypeError, D)  # because foo is still abstract
-            self.assertTrue(isabstract(D))
-            class E(D):
-                def foo(self): pass
-            self.assertEqual(E.__abstractmethods__, set())
-            E()  # now foo is concrete, too
-            self.assertFalse(isabstract(E))
-            class F(E):
-                @abstractthing
-                def bar(self): pass  # abstract override of concrete
-            self.assertEqual(F.__abstractmethods__, {"bar"})
-            self.assertRaises(TypeError, F)  # because bar is abstract now
-            self.assertTrue(isabstract(F))
-
 
 class TestABC(unittest.TestCase):
 
@@ -416,9 +388,5 @@ class TestABC(unittest.TestCase):
         self.assertEqual(B.counter, 1)
 
 
-def test_main():
-    support.run_unittest(TestABC)
-
-
 if __name__ == "__main__":
     unittest.main()