Fix test skipping without cluster

distarray/globalapi/tests/test_functions.py

@@ -20,18 +20,20 @@
 import distarray.globalapi.functions as functions
 from distarray.globalapi import Context, ContextCreationError
 
+SKIP = True
 try:
     glb_ctx = Context()
-except ContextCreationError:
-    raise unittest.SkipTest()
+    SKIP = False
+except EnvironmentError:
+    pass
 
 def setUpModule():
     global glb_ctx
-    if not glb_ctx:
+    if not SKIP and not glb_ctx:
         glb_ctx = Context()
 
 def tearDownModule():
-    if glb_ctx:
+    if not SKIP and glb_ctx:
         glb_ctx.close()
 
 def add_checkers(cls, ops_and_data, checker_name):
@@ -48,10 +50,14 @@ def add_checkers(cls, ops_and_data, checker_name):
 
     ops, data = ops_and_data
 
-    dist_data = tuple(glb_ctx.fromndarray(d) for d in data)
+    if not SKIP:
+        dist_data = tuple(glb_ctx.fromndarray(d) for d in data)
 
     def check(op_name):
-        return lambda self: op_checker(self, op_name, data, dist_data)
+        if SKIP:
+            return lambda self: None
+        else:
+            return lambda self: op_checker(self, op_name, data, dist_data)
 
     for op_name in ops:
         op_test_name = 'test_' + op_name

distarray/testing.py

@@ -214,25 +214,27 @@ class IPythonContextTestCase(BaseContextTestCase):
 
     @classmethod
     def make_context(cls, targets=None):
-        return Context(kind='IPython', targets=targets)
-
-    @classmethod
-    def setUpClass(cls):
         try:
-            super(IPythonContextTestCase, cls).setUpClass()
-        # except EnvironmentError:
-        except IOError:
+            return Context(kind='IPython', targets=targets)
+        except EnvironmentError:
             msg = "You must have an ipcluster running to run this test case."
             raise unittest.SkipTest(msg)
-        else:
-            cls.client = cls.context.client
+
+    @classmethod
+    def setUpClass(cls):
+        super(IPythonContextTestCase, cls).setUpClass()
+        cls.client = cls.context.client
 
 
 class DefaultContextTestCase(BaseContextTestCase):
 
     @classmethod
     def make_context(cls, targets=None):
-        return Context(targets=targets)
+        try:
+            return Context(targets=targets)
+        except EnvironmentError:
+            msg = "You must have an ipcluster running to run this test case."
+            raise unittest.SkipTest(msg)
 
 
 def check_targets(required, available):