# HG changeset patch # User Julien Jehannet # Date 1285344520 -7200 # Node ID ad5e0898115370c11a68a0114283b747b78e859f # Parent 470d8e828fda52292d69d3bf797db83ec44a093f [tests] import TestSuite from lgc.testlib for further compatibility diff -r 470d8e828fda -r ad5e08981153 devtools/cwwindmill.py --- a/devtools/cwwindmill.py Fri Sep 24 18:20:59 2010 +0200 +++ b/devtools/cwwindmill.py Fri Sep 24 18:08:40 2010 +0200 @@ -26,10 +26,9 @@ import os, os.path as osp import sys -import unittest # imported by default to simplify further import statements -from logilab.common.testlib import unittest_main +from logilab.common.testlib import TestCase, unittest_main import windmill from windmill.dep import functest @@ -45,7 +44,7 @@ unittestreporter = UnitTestReporter() functest.reports.register_reporter(unittestreporter) -class WindmillUnitTestCase(unittest.TestCase): +class WindmillUnitTestCase(TestCase): def setUp(self): windmill.stdout, windmill.stdin = sys.stdout, sys.stdin from windmill.bin.admin_lib import configure_global_settings, setup diff -r 470d8e828fda -r ad5e08981153 devtools/test/unittest_testlib.py --- a/devtools/test/unittest_testlib.py Fri Sep 24 18:20:59 2010 +0200 +++ b/devtools/test/unittest_testlib.py Fri Sep 24 18:08:40 2010 +0200 @@ -20,9 +20,8 @@ """ from cStringIO import StringIO -from unittest import TestSuite -from logilab.common.testlib import (TestCase, unittest_main, +from logilab.common.testlib import (TestCase, unittest_main, TestSuite, SkipAwareTextTestRunner) from cubicweb.devtools import htmlparser