summaryrefslogtreecommitdiff
path: root/testlib.py
diff options
context:
space:
mode:
authorJulien Jehannet <julien.jehannet@logilab.fr>2010-09-24 19:39:37 +0200
committerJulien Jehannet <julien.jehannet@logilab.fr>2010-09-24 19:39:37 +0200
commitd30cb6f9e3d795069f3f594af2ae0c85e3f80a18 (patch)
tree316930bc17114ee07e4afddccba3e10afdd0daf4 /testlib.py
parent1ca37b55f874d3df6f97a006c8690b985a86c00b (diff)
downloadlogilab-common-d30cb6f9e3d795069f3f594af2ae0c85e3f80a18.tar.gz
(cleaning)
Diffstat (limited to 'testlib.py')
-rw-r--r--testlib.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/testlib.py b/testlib.py
index 05b2794..4b9103a 100644
--- a/testlib.py
+++ b/testlib.py
@@ -102,8 +102,6 @@ ENABLE_DBC = False
FILE_RESTART = ".pytest.restart"
-UNITTEST2 = getattr(unittest, "__package__", "") == 'unittest2'
-
# used by unittest to count the number of relevant levels in the traceback
__unittest = 1
@@ -204,7 +202,6 @@ def find_tests(testdir,
tests.sort()
return tests
-
def run_test(test, verbose, runner=None, capture=0):
"""
Run a single test.
@@ -313,7 +310,6 @@ class SkipAwareTestResult(unittest._TextTestResult):
if self.pdbmode:
self.debuggers.append(self.pdbclass(sys.exc_info()[2]))
-
def _iter_valid_frames(self, frames):
"""only consider non-testlib frames when formatting traceback"""
lgc_testlib = osp.abspath(__file__)
@@ -789,7 +785,6 @@ Examples:
except getopt.error, msg:
self.usageExit(msg)
-
def runTests(self):
if self.profile_name:
import cProfile
@@ -960,6 +955,7 @@ def unittest_main(module='__main__', defaultTest=None,
return SkipAwareTestProgram(module, defaultTest, batchmode,
cvg, options, outstream)
+
class InnerTestSkipped(SkipTest):
"""raised when a test is skipped"""
pass
@@ -968,7 +964,6 @@ def is_generator(function):
flags = function.func_code.co_flags
return flags & CO_GENERATOR
-
def parse_generative_args(params):
args = []
varargs = ()
@@ -993,6 +988,7 @@ def parse_generative_args(params):
return args, kwargs
+
class InnerTest(tuple):
def __new__(cls, name, *data):
instance = tuple.__new__(cls, data)