windows compat

- try to ensure ipython_dir is cleaned up last
- use CTRL_C_EVENT for Windows (can't use SIGINT)

Author: minrk

ipyparallel/tests/conftest.py

@@ -47,14 +47,17 @@ def pytest_collection_modifyitems(items):
 
 
 @pytest.fixture(scope="session")
-def cluster(request):
+def cluster(request, ipython_dir):
     """Setup IPython parallel cluster"""
     setup()
-    request.addfinalizer(teardown)
+    try:
+        yield
+    finally:
+        teardown()
 
 
 @pytest.fixture(scope='session')
-def ipython():
+def ipython(ipython_dir):
     config = default_config()
     config.TerminalInteractiveShell.simple_prompt = True
     shell = TerminalInteractiveShell.instance(config=config)
@@ -81,7 +84,7 @@ def Context():
 
 
 @pytest.fixture
-def Cluster(request, io_loop):
+def Cluster(request, ipython_dir, io_loop):
     """Fixture for instantiating Clusters"""
 
     def ClusterConstructor(**kwargs):

ipyparallel/tests/test_client.py

@@ -661,7 +661,12 @@ def test_wait_for_engines(self):
 
     def test_signal_engines(self):
         view = self.client[:]
-        for sig in (signal.SIGINT, 'SIGINT'):
+        if sys.platform.startswith("win"):
+            signame = 'CTRL_C_EVENT'
+        else:
+            signame = 'SIGINT'
+        signum = getattr(signal, signame)
+        for sig in (signum, signame):
             ar = view.apply_async(time.sleep, 10)
             # FIXME: use status:busy to wait for tasks to start
             time.sleep(1)