--- a/devtools/testlib.py	Thu Oct 23 15:47:17 2014 +0200
+++ b/devtools/testlib.py	Thu Nov 27 12:11:29 2014 +0100
@@ -32,7 +32,7 @@
 import yams.schema
 
 from logilab.common.testlib import TestCase, InnerTest, Tags
-from logilab.common.pytest import nocoverage, pause_tracing, resume_tracing
+from logilab.common.pytest import nocoverage, pause_trace
 from logilab.common.debugger import Debugger
 from logilab.common.umessage import message_from_string
 from logilab.common.decorators import cached, classproperty, clear_cache, iclassmethod
@@ -572,18 +572,17 @@
     def setUp(self):
         # monkey patch send mail operation so emails are sent synchronously
         self._patch_SendMailOp()
-        pause_tracing()
-        previous_failure = self.__class__.__dict__.get('_repo_init_failed')
-        if previous_failure is not None:
-            self.skipTest('repository is not initialised: %r' % previous_failure)
-        try:
-            self._init_repo()
-            self.addCleanup(self._close_cnx)
-        except Exception as ex:
-            self.__class__._repo_init_failed = ex
-            raise
-        self.addCleanup(self._close_access)
-        resume_tracing()
+        with pause_trace():
+            previous_failure = self.__class__.__dict__.get('_repo_init_failed')
+            if previous_failure is not None:
+                self.skipTest('repository is not initialised: %r' % previous_failure)
+            try:
+                self._init_repo()
+                self.addCleanup(self._close_cnx)
+            except Exception as ex:
+                self.__class__._repo_init_failed = ex
+                raise
+            self.addCleanup(self._close_access)
         self.setup_database()
         self._admin_clt_cnx.commit()
         MAILBOX[:] = [] # reset mailbox