nose compat

Author: florentx

testsuite/support.py

@@ -140,7 +140,6 @@ def run_tests(filename):
         return report.counters['failed tests']
 
     pep8style.runner = run_tests
-init_tests.__test__ = False
 
 
 def run_tests(style):
@@ -159,4 +158,6 @@ def run_tests(style):
     if options.testsuite:
         init_tests(style)
     return style.check_files()
-run_tests.__test__ = False
+
+# nose should not collect these functions
+init_tests.__test__ = run_tests.__test__ = False

testsuite/test_all.py

@@ -46,18 +46,17 @@ def test_own_dog_food(self):
 
 
 def suite():
-    from testsuite.test_api import APITestCase
-    from testsuite.test_shell import ShellTestCase
+    from testsuite import test_api, test_shell
 
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Pep8TestCase))
-    suite.addTest(unittest.makeSuite(APITestCase))
-    suite.addTest(unittest.makeSuite(ShellTestCase))
+    suite.addTest(unittest.makeSuite(test_api.APITestCase))
+    suite.addTest(unittest.makeSuite(test_shell.ShellTestCase))
     return suite
 
 
-def test_main():
+def _main():
     return unittest.TextTestRunner(verbosity=2).run(suite())
 
 if __name__ == '__main__':
-    sys.exit(not test_main())
+    sys.exit(not _main())