##// END OF EJS Templates
Merge pull request #2804 from minrk/windows_noipc...
Min RK -
r9162:8cb2a06f merge
parent child Browse files
Show More
@@ -4,6 +4,8 from subprocess import PIPE
4 import time
4 import time
5 from unittest import TestCase
5 from unittest import TestCase
6
6
7 from IPython.testing import decorators as dec
8
7 from IPython.config.loader import Config
9 from IPython.config.loader import Config
8 from IPython.frontend.html.notebook.kernelmanager import MultiKernelManager
10 from IPython.frontend.html.notebook.kernelmanager import MultiKernelManager
9 from IPython.zmq.kernelmanager import KernelManager
11 from IPython.zmq.kernelmanager import KernelManager
@@ -62,6 +64,7 class TestKernelManager(TestCase):
62 km = self._get_tcp_km()
64 km = self._get_tcp_km()
63 self._run_lifecycle(km)
65 self._run_lifecycle(km)
64
66
67 @dec.skip_win32
65 def test_tcp_cinfo(self):
68 def test_tcp_cinfo(self):
66 km = self._get_tcp_km()
69 km = self._get_tcp_km()
67 self._run_cinfo(km, 'tcp', '127.0.0.1')
70 self._run_cinfo(km, 'tcp', '127.0.0.1')
@@ -4,6 +4,8 from subprocess import PIPE
4 import time
4 import time
5 from unittest import TestCase
5 from unittest import TestCase
6
6
7 from IPython.testing import decorators as dec
8
7 from IPython.config.loader import Config
9 from IPython.config.loader import Config
8 from IPython.zmq.kernelmanager import KernelManager
10 from IPython.zmq.kernelmanager import KernelManager
9
11
@@ -39,6 +41,7 class TestKernelManager(TestCase):
39 km = self._get_tcp_km()
41 km = self._get_tcp_km()
40 self._run_lifecycle(km)
42 self._run_lifecycle(km)
41
43
44 @dec.skip_win32
42 def testipc_lifecycle(self):
45 def testipc_lifecycle(self):
43 km = self._get_ipc_km()
46 km = self._get_ipc_km()
44 self._run_lifecycle(km)
47 self._run_lifecycle(km)
General Comments 0
You need to be logged in to leave comments. Login now