##// END OF EJS Templates
Skipping a few tests related to the wx frontend that fail on Windows.
Brian Granger -
Show More
@@ -17,6 +17,7 b' from time import sleep'
17 import sys
17 import sys
18
18
19 from IPython.frontend._process import PipedProcess
19 from IPython.frontend._process import PipedProcess
20 from IPython.testing import decorators as testdec
20
21
21 def test_capture_out():
22 def test_capture_out():
22 """ A simple test to see if we can execute a process and get the output.
23 """ A simple test to see if we can execute a process and get the output.
@@ -25,9 +26,11 b' def test_capture_out():'
25 p = PipedProcess('echo 1', out_callback=s.write, )
26 p = PipedProcess('echo 1', out_callback=s.write, )
26 p.start()
27 p.start()
27 p.join()
28 p.join()
28 assert s.getvalue() == '1\n'
29 result = s.getvalue().rstrip()
29
30 assert result == '1'
30
31
32 # FIXME
33 @testdec.skip("This doesn't work under Windows")
31 def test_io():
34 def test_io():
32 """ Checks that we can send characters on stdin to the process.
35 """ Checks that we can send characters on stdin to the process.
33 """
36 """
@@ -40,7 +43,8 b' def test_io():'
40 sleep(0.1)
43 sleep(0.1)
41 p.process.stdin.write(test_string)
44 p.process.stdin.write(test_string)
42 p.join()
45 p.join()
43 assert s.getvalue() == test_string
46 result = s.getvalue()
47 assert result == test_string
44
48
45
49
46 def test_kill():
50 def test_kill():
@@ -16,7 +16,10 b' __docformat__ = "restructuredtext en"'
16 import os
16 import os
17 from cStringIO import StringIO
17 from cStringIO import StringIO
18
18
19 from IPython.testing import decorators as testdec
19
20
21 # FIXME
22 @testdec.skip("This doesn't work under Windows")
20 def test_redirector():
23 def test_redirector():
21 """ Checks that the redirector can be used to do synchronous capture.
24 """ Checks that the redirector can be used to do synchronous capture.
22 """
25 """
@@ -33,9 +36,12 b' def test_redirector():'
33 r.stop()
36 r.stop()
34 raise
37 raise
35 r.stop()
38 r.stop()
36 assert out.getvalue() == "".join("%ic\n%i\n" %(i, i) for i in range(10))
39 result1 = out.getvalue()
37
40 result2 = "".join("%ic\n%i\n" %(i, i) for i in range(10))
41 assert result1 == result2
38
42
43 # FIXME
44 @testdec.skip("This doesn't work under Windows")
39 def test_redirector_output_trap():
45 def test_redirector_output_trap():
40 """ This test check not only that the redirector_output_trap does
46 """ This test check not only that the redirector_output_trap does
41 trap the output, but also that it does it in a gready way, that
47 trap the output, but also that it does it in a gready way, that
@@ -54,8 +60,9 b' def test_redirector_output_trap():'
54 trap.unset()
60 trap.unset()
55 raise
61 raise
56 trap.unset()
62 trap.unset()
57 assert out.getvalue() == "".join("%ic\n%ip\n%i\n" %(i, i, i)
63 result1 = out.getvalue()
58 for i in range(10))
64 result2 = "".join("%ic\n%ip\n%i\n" %(i, i, i) for i in range(10))
65 assert result1 == result2
59
66
60
67
61
68
@@ -354,8 +354,8 b' Installation and testing scenarios'
354
354
355 This section outlines the various scenarios that we need to test before we release an IPython version. These scenarios represent different ways of installing IPython and its dependencies.
355 This section outlines the various scenarios that we need to test before we release an IPython version. These scenarios represent different ways of installing IPython and its dependencies.
356
356
357 Installation scenarios
357 Installation scenarios under Linux and OS X
358 ----------------------
358 -------------------------------------------
359
359
360 1. Install from tarball using `python setup.py install`.
360 1. Install from tarball using `python setup.py install`.
361 a. With only readline+nose dependencies installed.
361 a. With only readline+nose dependencies installed.
@@ -367,6 +367,12 b' Installation scenarios'
367 ii. Optional dependency sets: `easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]`
367 ii. Optional dependency sets: `easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]`
368 b. With all dependencies already installed.
368 b. With all dependencies already installed.
369
369
370 Installation scenarios under Win32
371 ----------------------------------
372
373 1. Install everything from .exe installers
374 2. easy_install?
375
370
376
371 Tests to run for these scenarios
377 Tests to run for these scenarios
372 --------------------------------
378 --------------------------------
@@ -140,15 +140,15 b" if 'setuptools' in sys.modules:"
140 'ipythonx = IPython.frontend.wx.ipythonx:main'
140 'ipythonx = IPython.frontend.wx.ipythonx:main'
141 ]
141 ]
142 }
142 }
143 setup_args["extras_require"] = dict(
143 setup_args['extras_require'] = dict(
144 kernel = [
144 kernel = [
145 "zope.interface>=3.4.1",
145 'zope.interface>=3.4.1',
146 "Twisted>=8.0.1",
146 'Twisted>=8.0.1',
147 "foolscap>=0.2.6"
147 'foolscap>=0.2.6'
148 ],
148 ],
149 doc=['Sphinx>=0.3','pygments'],
149 doc='Sphinx>=0.3',
150 test='nose>=0.10.1',
150 test='nose>=0.10.1',
151 security=["pyOpenSSL>=0.6"]
151 security='pyOpenSSL>=0.6'
152 )
152 )
153 # Allow setuptools to handle the scripts
153 # Allow setuptools to handle the scripts
154 scripts = []
154 scripts = []
General Comments 0
You need to be logged in to leave comments. Login now