[testlib] move dbc feature into pytest module + correct wrong import

2 files changed, 38 insertions, 36 deletions

diff --git a/pytest.py b/pytest.py
index c9bc270..98aa9b2 100644
--- a/pytest.py
+++ b/pytest.py
@@ -110,6 +110,9 @@ pytest --coverage test_foo.py
   (only if logilab.devtools is available)
 """
 
+ENABLE_DBC = False
+FILE_RESTART = ".pytest.restart"
+
 import os, sys, re
 import os.path as osp
 from time import time, clock
@@ -117,9 +120,10 @@ import warnings
 import types
 
 from logilab.common.fileutils import abspath_listdir
+from logilab.common import textutils
 from logilab.common import testlib, STD_BLACKLIST
 # use the same unittest module as testlib
-from logilab.common.testlib import unittest
+from logilab.common.testlib import unittest, start_interactive_mode
 from logilab.common.compat import any
 import doctest
 
@@ -186,9 +190,6 @@ def nocoverage(func):
 ## end of coverage hacks
 
 
-
-
-
 TESTFILE_RE = re.compile("^((unit)?test.*|smoketest)\.py$")
 def this_is_a_testfile(filename):
     """returns True if `filename` seems to be a test file"""
@@ -382,11 +383,11 @@ class PyTester(object):
                 if self.options.exitfirst and not self.options.restart:
                     # overwrite restart file
                     try:
-                        restartfile = open(testlib.FILE_RESTART, "w")
+                        restartfile = open(FILE_RESTART, "w")
                         restartfile.close()
                     except Exception, e:
                         print >> sys.__stderr__, "Error while overwriting \
-succeeded test file :", osp.join(os.getcwd(), testlib.FILE_RESTART)
+succeeded test file :", osp.join(os.getcwd(), FILE_RESTART)
                         raise e
                 # run test and collect information
                 prog = self.testfile(filename, batchmode=True)
@@ -409,11 +410,11 @@ succeeded test file :", osp.join(os.getcwd(), testlib.FILE_RESTART)
         # overwrite restart file if it has not been done already
         if self.options.exitfirst and not self.options.restart and self.firstwrite:
             try:
-                restartfile = open(testlib.FILE_RESTART, "w")
+                restartfile = open(FILE_RESTART, "w")
                 restartfile.close()
             except Exception, e:
                 print >> sys.__stderr__, "Error while overwriting \
-succeeded test file :", osp.join(os.getcwd(), testlib.FILE_RESTART)
+succeeded test file :", osp.join(os.getcwd(), FILE_RESTART)
                 raise e
         modname = osp.basename(filename)[:-3]
         try:
@@ -873,13 +874,13 @@ Examples:
             """ Recursive function that removes succTests from
             a TestSuite or TestCase
             """
-            if isinstance(obj, TestSuite):
+            if isinstance(obj, unittest.TestSuite):
                 removeSucceededTests(obj._tests, succTests)
             if isinstance(obj, list):
                 for el in obj[:]:
-                    if isinstance(el, TestSuite):
+                    if isinstance(el, unittest.TestSuite):
                         removeSucceededTests(el, succTests)
-                    elif isinstance(el, TestCase):
+                    elif isinstance(el, unittest.TestCase):
                         descr = '.'.join((el.__class__.__module__,
                                 el.__class__.__name__,
                                 el._testMethodName))
@@ -1176,6 +1177,26 @@ def _ts_wrapped_run(self, result, debug=False, runcondition=None, options=None):
             test.debug()
 
 
+def enable_dbc(*args):
+    """
+    Without arguments, return True if contracts can be enabled and should be
+    enabled (see option -d), return False otherwise.
+
+    With arguments, return False if contracts can't or shouldn't be enabled,
+    otherwise weave ContractAspect with items passed as arguments.
+    """
+    if not ENABLE_DBC:
+        return False
+    try:
+        from logilab.aspects.weaver import weaver
+        from logilab.aspects.lib.contracts import ContractAspect
+    except ImportError:
+        sys.stderr.write(
+            'Warning: logilab.aspects is not available. Contracts disabled.')
+        return False
+    for arg in args:
+        weaver.weave_module(arg, ContractAspect)
+    return True
 
 
 # monkeypatch unittest and doctest (ouch !)
@@ -1183,8 +1204,12 @@ unittest._TextTestResult = testlib.SkipAwareTestResult
 unittest.TextTestRunner = SkipAwareTextTestRunner
 unittest.TestLoader = NonStrictTestLoader
 unittest.TestProgram = SkipAwareTestProgram
+
 if sys.version_info >= (2, 4):
     doctest.DocTestCase.__bases__ = (testlib.TestCase,)
+    # XXX check python2.6 compatibility
+    #doctest.DocTestCase._cleanups = []
+    #doctest.DocTestCase._out = []
 else:
     unittest.FunctionTestCase.__bases__ = (testlib.TestCase,)
 unittest.TestSuite.run = _ts_run
diff --git a/testlib.py b/testlib.py
index cbde8e2..6750f7b 100644
--- a/testlib.py
+++ b/testlib.py
@@ -98,9 +98,6 @@ __all__ = ['main', 'unittest_main', 'find_tests', 'run_test', 'spawn']
 DEFAULT_PREFIXES = ('test', 'regrtest', 'smoketest', 'unittest',
                     'func', 'validation')
 
-ENABLE_DBC = False
-
-FILE_RESTART = ".pytest.restart"
 
 if sys.version_info >= (2, 6):
     # FIXME : this does not work as expected / breaks tests on testlib
@@ -659,6 +656,7 @@ class TestCase(unittest.TestCase):
         This is mostly a copy/paste from unittest.py (i.e same
         variable names, same logic, except for the generative tests part)
         """
+        from logilab.common.pytest import FILE_RESTART
         if result is None:
             result = self.defaultTestResult()
         result.pdbclass = self.pdbclass
@@ -1319,7 +1317,7 @@ class DocTest(TestCase):
     """
     skipped = ()
     def __call__(self, result=None, runcondition=None, options=None):\
-            # pylint: disable=W0613
+        # pylint: disable=W0613
         try:
             finder = DocTestFinder(skipped=self.skipped)
             if sys.version_info >= (2, 4):
@@ -1447,27 +1445,6 @@ def create_files(paths, chroot):
     for filepath in files:
         open(filepath, 'w').close()
 
-def enable_dbc(*args):
-    """
-    Without arguments, return True if contracts can be enabled and should be
-    enabled (see option -d), return False otherwise.
-
-    With arguments, return False if contracts can't or shouldn't be enabled,
-    otherwise weave ContractAspect with items passed as arguments.
-    """
-    if not ENABLE_DBC:
-        return False
-    try:
-        from logilab.aspects.weaver import weaver
-        from logilab.aspects.lib.contracts import ContractAspect
-    except ImportError:
-        sys.stderr.write(
-            'Warning: logilab.aspects is not available. Contracts disabled.')
-        return False
-    for arg in args:
-        weaver.weave_module(arg, ContractAspect)
-    return True
-
 
 class AttrObject: # XXX cf mock_object
     def __init__(self, **kwargs):