merge stable heads stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 13 Jan 2011 19:23:00 +0100
branchstable
changeset 6821 945fce560757
parent 6820 e193fd186990 (current diff)
parent 6818 5fa425574548 (diff)
child 6822 47f4950ff815
child 6823 dc4693820fc7
merge stable heads
--- a/devtools/repotest.py	Thu Jan 13 19:18:16 2011 +0100
+++ b/devtools/repotest.py	Thu Jan 13 19:23:00 2011 +0100
@@ -26,6 +26,7 @@
 from pprint import pprint
 
 from logilab.common.decorators import clear_cache
+from logilab.common.testlib import SkipTest
 
 def tuplify(list):
     for i in range(len(list)):
@@ -156,7 +157,7 @@
             try:
                 cls.dbhelper = get_db_helper(cls.backend)
             except ImportError, ex:
-                cls.skipTest(str(ex))
+                raise SkipTest(str(ex))
 
     def setUp(self):
         self.repo = FakeRepo(self.schema)
--- a/server/test/unittest_fti.py	Thu Jan 13 19:18:16 2011 +0100
+++ b/server/test/unittest_fti.py	Thu Jan 13 19:23:00 2011 +0100
@@ -2,6 +2,8 @@
 
 import socket
 
+from logilab.common.testlib import SkipTest
+
 from cubicweb.devtools import ApptestConfiguration
 from cubicweb.devtools.testlib import CubicWebTC
 from cubicweb.selectors import is_instance
@@ -9,8 +11,6 @@
 
 AT_LOGILAB = socket.gethostname().endswith('.logilab.fr')
 
-from logilab.common.testlib import SkipTest
-
 
 class PostgresFTITC(CubicWebTC):
     config = ApptestConfiguration('data', sourcefile='sources_fti')