Show More
@@ -71,16 +71,11 b' mswindows = (sys.platform == "win32")' | |||||
71 | skip = False |
|
71 | skip = False | |
72 |
|
72 | |||
73 | if mswindows: |
|
73 | if mswindows: | |
74 | # Some versions of windows, in some strange corner cases, give |
|
74 | import platform | |
75 | # errror with the killableprocess. |
|
75 | if platform.uname()[3] == '' or platform.uname()[3] > '6.0.6000': | |
76 | if sys.version_info[:2] > (2, 4): |
|
|||
77 | import platform |
|
|||
78 | if platform.uname()[3] == '' or platform.uname()[3] > '6.0.6000': |
|
|||
79 | skip = True |
|
|||
80 | else: |
|
|||
81 | import winprocess |
|
|||
82 | else: |
|
|||
83 | skip = True |
|
76 | skip = True | |
|
77 | else: | |||
|
78 | import winprocess | |||
84 | else: |
|
79 | else: | |
85 | import signal |
|
80 | import signal | |
86 |
|
81 |
@@ -50,7 +50,7 b' class PipedProcess(Thread):' | |||||
50 | """ |
|
50 | """ | |
51 | env = os.environ |
|
51 | env = os.environ | |
52 | env['TERM'] = 'xterm' |
|
52 | env['TERM'] = 'xterm' | |
53 |
process = Popen |
|
53 | process = Popen(self.command_string + ' 2>&1', shell=True, | |
54 | env=env, |
|
54 | env=env, | |
55 | universal_newlines=True, |
|
55 | universal_newlines=True, | |
56 | stdout=PIPE, stdin=PIPE, ) |
|
56 | stdout=PIPE, stdin=PIPE, ) |
@@ -20,8 +20,6 b' from IPython.frontend._process import PipedProcess' | |||||
20 | from IPython.testing import decorators as testdec |
|
20 | from IPython.testing import decorators as testdec | |
21 |
|
21 | |||
22 |
|
22 | |||
23 | # FIXME |
|
|||
24 | @testdec.skip("This doesn't work under Windows") |
|
|||
25 | def test_capture_out(): |
|
23 | def test_capture_out(): | |
26 | """ A simple test to see if we can execute a process and get the output. |
|
24 | """ A simple test to see if we can execute a process and get the output. | |
27 | """ |
|
25 | """ | |
@@ -33,8 +31,6 b' def test_capture_out():' | |||||
33 | assert result == '1' |
|
31 | assert result == '1' | |
34 |
|
32 | |||
35 |
|
33 | |||
36 | # FIXME |
|
|||
37 | @testdec.skip("This doesn't work under Windows") |
|
|||
38 | def test_io(): |
|
34 | def test_io(): | |
39 | """ Checks that we can send characters on stdin to the process. |
|
35 | """ Checks that we can send characters on stdin to the process. | |
40 | """ |
|
36 | """ | |
@@ -51,8 +47,6 b' def test_io():' | |||||
51 | assert result == test_string |
|
47 | assert result == test_string | |
52 |
|
48 | |||
53 |
|
49 | |||
54 | # FIXME |
|
|||
55 | @testdec.skip("This doesn't work under Windows") |
|
|||
56 | def test_kill(): |
|
50 | def test_kill(): | |
57 | """ Check that we can kill a process, and its subprocess. |
|
51 | """ Check that we can kill a process, and its subprocess. | |
58 | """ |
|
52 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now