diff options
author | Adrien Di Mascio <Adrien.DiMascio@logilab.fr> | 2008-05-05 15:44:43 +0200 |
---|---|---|
committer | Adrien Di Mascio <Adrien.DiMascio@logilab.fr> | 2008-05-05 15:44:43 +0200 |
commit | b96509b4a565cca6a1f2f8a9771ebd152ead3be1 (patch) | |
tree | 895024666f713bb92a73ed7cf6665537f67a12f9 | |
parent | 7bff3da39a4ca51e0f4d890c7295d097a7496025 (diff) | |
download | logilab-common-b96509b4a565cca6a1f2f8a9771ebd152ead3be1.tar.gz |
revert this patch: we're not ready for that
-rw-r--r-- | test/unittest_testlib.py | 28 | ||||
-rw-r--r-- | testlib.py | 17 |
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), @@ -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: |