Merge bffa97f into d688f97

.travis.yml

@@ -1,12 +1,13 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
+  - "3.4"
+  - "3.5"
 install:
-  - "pip install --use-mirrors coverage coveralls"
-  - "pip install --use-mirrors -r test_requirements.txt"
-  - "pip install --use-mirrors git+https://github.com/landscapeio/pylint-plugin-utils.git@develop"
-  - "pip install --use-mirrors --editable ."
+  - "pip install coverage coveralls"
+  - "pip install -r test_requirements.txt"
+  - "pip install git+https://github.com/landscapeio/pylint-plugin-utils.git@develop"
+  - "pip install --editable ."
 script:
   coverage run test/test_func.py
 after_success:

test/test_func.py

@@ -1,7 +1,6 @@
 
 from os.path import join, dirname, abspath
 import unittest
-from logilab.common import testlib
 from pylint.testutils import make_tests, LintTestUsingModule, LintTestUsingFile, cb_test_gen, linter
 import sys
 
@@ -17,14 +16,14 @@
 
 
 def suite():
-    return testlib.TestSuite([unittest.makeSuite(test, suiteClass=testlib.TestSuite)
-                              for test in make_tests(INPUT_DIR, MESSAGES_DIR,
-                                                     FILTER_RGX, CALLBACKS)])
+    return unittest.TestSuite([unittest.makeSuite(test, suiteClass=unittest.TestSuite)
+                               for test in make_tests(INPUT_DIR, MESSAGES_DIR,
+                                                      FILTER_RGX, CALLBACKS)])
 
 if __name__=='__main__':
     if len(sys.argv) > 1:
         FILTER_RGX = sys.argv[1]
         del sys.argv[1]
-    testlib.unittest_main(defaultTest='suite')
+    unittest.main(defaultTest='suite')