make TestAccelerator[Not]Imported for ElementTree more robust

eliben · eliben · commit 292f9a891d21 · 2012-02-16T19:55:29.000+02:00
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -1907,9 +1907,7 @@ def __exit__(self, *args):
 class TestAcceleratorNotImported(unittest.TestCase):
     # Test that the C accelerator was not imported for pyET
     def test_correct_import_pyET(self):
-        # In the C accelerator, Element is just a factory function, not an
-        # actual class. In the Python version it's a class.
-        self.assertIsInstance(pyET.Element, type)
+        self.assertEqual(pyET.Element.__module__, 'xml.etree.ElementTree')
 
 
 def test_main(module=pyET):
diff --git a/Lib/test/test_xml_etree_c.py b/Lib/test/test_xml_etree_c.py
@@ -46,15 +46,11 @@ def test_length_overflow(self, size):
         finally:
             data = None
 
+@unittest.skipUnless(cET, 'requires _elementtree')
 class TestAcceleratorImported(unittest.TestCase):
     # Test that the C accelerator was imported, as expected
     def test_correct_import_cET(self):
-        # In the C accelerator, Element is just a factory function, not an
-        # actual class. In the Python version it's a class.
-        self.assertNotIsInstance(cET.Element, type)
-
-    #def test_correct_import_cET_alias(self):
-        #self.assertNotIsInstance(cET_alias.Element, type)
+        self.assertEqual(cET.Element.__module__, '_elementtree')
 
 
 def test_main():
