just do module discovery once and skip urwid UrwidCrashersTest

thomasballinger · thomasballinger · commit 970d3b929829 · 2014-10-17T20:11:53.000-04:00
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -7,6 +7,12 @@
 import textwrap
 import unittest
 
+try:
+    from unittest import skip
+except ImportError:
+    def skip(f):
+        return lambda self: None
+
 try:
     from twisted.internet import reactor
     from twisted.internet.defer import Deferred
@@ -104,6 +110,7 @@ def check_no_traceback(self, data):
     class CursesCrashersTest(TrialTestCase, CrashersTest):
         backend = "cli"
 
+    @skip("take 6 seconds, and Simon says we can skip them")
     class UrwidCrashersTest(TrialTestCase, CrashersTest):
         backend = "urwid"
 
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -15,11 +15,13 @@ def test_package_completion(self):
 
 
 class TestRealComplete(unittest.TestCase):
-    def setUp(self):
+    @classmethod
+    def setUpClass(cls):
         [_ for _ in importcompletion.find_iterator]
         __import__('sys')
         __import__('os')
-    def tearDown(self):
+    @classmethod
+    def tearDownClass(cls):
         importcompletion.find_iterator = importcompletion.find_all_modules()
         importcompletion.modules = set()
     def test_from_attribute(self):
