revert this patch: we're not ready for that

2 files changed, 3 insertions, 42 deletions

diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index f969532..d53c239 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -388,34 +388,8 @@ class TestLoaderTC(TestCase):
                 ]
         for pattern, expected_count in data:
             yield self.assertRunCount, pattern, MyMod, expected_count
-
-    def test_pattern_and_variable_conflict(self):
-        class MyMod:
-            today = staticmethod(lambda: None)
-            class MyTestCase(TestCase):
-                def test_today(self): pass
-        data = [('today', 1)]
-        for pattern, expected_count in data:
-            yield self.assertRunCount, pattern, MyMod, expected_count
             
-
-    def test_testsuite_handling(self):
-        class MyMod:
-            class MyTestCase(TestCase):
-                def test_x(self): pass
-                def test_y(self): pass
-                def test_z(self): pass
-            def suite():
-                suite = TestSuite()
-                suite.addTest(MyMod.MyTestCase('test_x'))
-                suite.addTest(MyMod.MyTestCase('test_y'))
-                return suite
-            suite = staticmethod(suite) # make it easily callable
-        data = [('MyTestCase.test_y', 1)]
-        data = [('suite', 2)]
-        for pattern, expected_count in data:
-            yield self.assertRunCount, pattern, MyMod, expected_count
-                
+        
     def test_collect_everything_and_skipped_patterns(self):
         testdata = [ (['foo1'], 3), (['foo'], 2),
                      (['foo', 'bar'], 0),
diff --git a/testlib.py b/testlib.py
index d873305..ca3e62d 100644
--- a/testlib.py
+++ b/testlib.py
@@ -501,18 +501,6 @@ class starargs(tuple):
         return tuple.__new__(cls, args)
 
 
-def is_testsuite(obj):
-    """convenience function which tests if `obj` is a TestSuite factory
-    """
-    if callable(obj):
-        try:
-            test = obj()
-            if isinstance(test, unittest.TestSuite):
-                return True
-        except TypeError:
-            return False
-        return False
-
 
 class NonStrictTestLoader(unittest.TestLoader):
     """
@@ -574,7 +562,7 @@ class NonStrictTestLoader(unittest.TestLoader):
         # python2.3 does not implement __iter__ on suites, we need to return
         # _tests explicitly
         return suite._tests
-
+    
     def loadTestsFromName(self, name, module=None):
         parts = name.split('.')
         if module is None or len(parts) > 2:
@@ -586,8 +574,7 @@ class NonStrictTestLoader(unittest.TestLoader):
         collected = []
         if len(parts) == 1:
             pattern = parts[0]
-            obj = getattr(module, pattern, None)
-            if is_testsuite(obj) and pattern not in tests:
+            if callable(getattr(module, pattern, None)) and pattern not in tests:
                 # consider it as a suite
                 return self.loadTestsFromSuite(module, pattern)
             if pattern in tests: