From f474d5003ee3eb5298058588bebeb26e8447b09d 2013-02-10 06:42:35
From: Min RK <benjaminrk@gmail.com>
Date: 2013-02-10 06:42:35
Subject: [PATCH] Merge pull request #2904 from minrk/winipc

Skip remaining IPC test on Windows

also fix an issue that could appear as an AttributeError when KM.__del__ is called during gc on process exit.

closes #2898
---

diff --git a/IPython/kernel/kernelmanager.py b/IPython/kernel/kernelmanager.py
index 8a21f3e..384f183 100644
--- a/IPython/kernel/kernelmanager.py
+++ b/IPython/kernel/kernelmanager.py
@@ -849,7 +849,7 @@ class KernelManager(Configurable):
             self._connection_file_written = False
             try:
                 os.remove(self.connection_file)
-            except (IOError, OSError):
+            except (IOError, OSError, AttributeError):
                 pass
     
     def cleanup_ipc_files(self):
diff --git a/IPython/kernel/tests/test_multikernelmanager.py b/IPython/kernel/tests/test_multikernelmanager.py
index 5bf037b..49a5ac2 100644
--- a/IPython/kernel/tests/test_multikernelmanager.py
+++ b/IPython/kernel/tests/test_multikernelmanager.py
@@ -65,15 +65,16 @@ class TestKernelManager(TestCase):
         km = self._get_tcp_km()
         self._run_lifecycle(km)
     
-    @dec.skip_win32
     def test_tcp_cinfo(self):
         km = self._get_tcp_km()
         self._run_cinfo(km, 'tcp', LOCALHOST)
 
+    @dec.skip_win32
     def test_ipc_lifecycle(self):
         km = self._get_ipc_km()
         self._run_lifecycle(km)
     
+    @dec.skip_win32
     def test_ipc_cinfo(self):
         km = self._get_ipc_km()
         self._run_cinfo(km, 'ipc', 'test')