# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1294942980 -3600
# Node ID 945fce5607573ee7caa2d5ad86458fc60efe7845
# Parent  e193fd186990f9265f8c9a3eb1af957813430c91# Parent  5fa4255745480d1602d8b56ba14c0e1c6561905d
merge  stable heads

diff -r e193fd186990 -r 945fce560757 devtools/repotest.py
--- 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)
diff -r e193fd186990 -r 945fce560757 server/test/unittest_fti.py
--- 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')