Show More
@@ -20,10 +20,6 b' import IPython.testing.tools as tt' | |||||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
21 |
|
21 | |||
22 | def test_help_output(): |
|
22 | def test_help_output(): | |
23 | """ipython notebook -h works""" |
|
|||
24 | tt.help_output_test('notebook') |
|
|||
25 |
|
||||
26 | def test_help_all_output(): |
|
|||
27 | """ipython notebook --help-all works""" |
|
23 | """ipython notebook --help-all works""" | |
28 | tt.help_all_output_test('notebook') |
|
24 | tt.help_all_output_test('notebook') | |
29 |
|
25 |
@@ -23,7 +23,7 b' import nose.tools as nt' | |||||
23 |
|
23 | |||
24 | from IPython.kernel import KernelManager |
|
24 | from IPython.kernel import KernelManager | |
25 | from IPython.kernel.tests.test_message_spec import execute, flush_channels |
|
25 | from IPython.kernel.tests.test_message_spec import execute, flush_channels | |
26 | from IPython.testing import decorators as dec |
|
26 | from IPython.testing import decorators as dec, tools as tt | |
27 | from IPython.utils import path, py3compat |
|
27 | from IPython.utils import path, py3compat | |
28 |
|
28 | |||
29 | #------------------------------------------------------------------------------- |
|
29 | #------------------------------------------------------------------------------- | |
@@ -206,7 +206,6 b' def test_subprocess_error():' | |||||
206 | _check_mp_mode(kc, expected=False) |
|
206 | _check_mp_mode(kc, expected=False) | |
207 | _check_mp_mode(kc, expected=False, stream="stderr") |
|
207 | _check_mp_mode(kc, expected=False, stream="stderr") | |
208 |
|
208 | |||
209 |
|
||||
210 | # raw_input tests |
|
209 | # raw_input tests | |
211 |
|
210 | |||
212 | def test_raw_input(): |
|
211 | def test_raw_input(): | |
@@ -250,3 +249,8 b' def test_eval_input():' | |||||
250 | stdout, stderr = assemble_output(iopub) |
|
249 | stdout, stderr = assemble_output(iopub) | |
251 | nt.assert_equal(stdout, "2\n") |
|
250 | nt.assert_equal(stdout, "2\n") | |
252 |
|
251 | |||
|
252 | ||||
|
253 | def test_help_output(): | |||
|
254 | """ipython kernel --help-all works""" | |||
|
255 | tt.help_all_output_test('kernel') | |||
|
256 |
@@ -40,10 +40,6 b' class TestNbConvertApp(TestsBase):' | |||||
40 | self.assertIn("see '--help-all'", out) |
|
40 | self.assertIn("see '--help-all'", out) | |
41 |
|
41 | |||
42 | def test_help_output(self): |
|
42 | def test_help_output(self): | |
43 | """ipython nbconvert -h works""" |
|
|||
44 | tt.help_output_test('nbconvert') |
|
|||
45 |
|
||||
46 | def test_help_all_output(self): |
|
|||
47 | """ipython nbconvert --help-all works""" |
|
43 | """ipython nbconvert --help-all works""" | |
48 | tt.help_all_output_test('nbconvert') |
|
44 | tt.help_all_output_test('nbconvert') | |
49 |
|
45 |
@@ -20,10 +20,6 b' import IPython.testing.tools as tt' | |||||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
21 |
|
21 | |||
22 | def test_help_output(): |
|
22 | def test_help_output(): | |
23 | """ipython qtconsole -h works""" |
|
|||
24 | tt.help_output_test('qtconsole') |
|
|||
25 |
|
||||
26 | def test_help_all_output(): |
|
|||
27 | """ipython qtconsole --help-all works""" |
|
23 | """ipython qtconsole --help-all works""" | |
28 | tt.help_all_output_test('qtconsole') |
|
24 | tt.help_all_output_test('qtconsole') | |
29 |
|
25 |
@@ -58,10 +58,6 b' def test_console_starts():' | |||||
58 | p.terminate() |
|
58 | p.terminate() | |
59 |
|
59 | |||
60 | def test_help_output(): |
|
60 | def test_help_output(): | |
61 | """ipython console -h works""" |
|
|||
62 | tt.help_output_test('console') |
|
|||
63 |
|
||||
64 | def test_help_all_output(): |
|
|||
65 | """ipython console --help-all works""" |
|
61 | """ipython console --help-all works""" | |
66 | tt.help_all_output_test('console') |
|
62 | tt.help_all_output_test('console') | |
67 |
|
63 |
@@ -19,37 +19,19 b' import IPython.testing.tools as tt' | |||||
19 |
|
19 | |||
20 |
|
20 | |||
21 | def test_ipython_help(): |
|
21 | def test_ipython_help(): | |
22 | tt.help_output_test() |
|
|||
23 |
|
||||
24 | def test_ipython_help_all(): |
|
|||
25 | tt.help_all_output_test() |
|
22 | tt.help_all_output_test() | |
26 |
|
23 | |||
27 | def test_profile_help(): |
|
24 | def test_profile_help(): | |
28 | tt.help_output_test("profile") |
|
|||
29 |
|
||||
30 | def test_profile_help_all(): |
|
|||
31 | tt.help_all_output_test("profile") |
|
25 | tt.help_all_output_test("profile") | |
32 |
|
26 | |||
33 | def test_profile_list_help(): |
|
27 | def test_profile_list_help(): | |
34 | tt.help_output_test("profile list") |
|
|||
35 |
|
||||
36 | def test_profile_list_help_all(): |
|
|||
37 | tt.help_all_output_test("profile list") |
|
28 | tt.help_all_output_test("profile list") | |
38 |
|
29 | |||
39 | def test_profile_create_help(): |
|
30 | def test_profile_create_help(): | |
40 | tt.help_output_test("profile create") |
|
|||
41 |
|
||||
42 | def test_profile_create_help_all(): |
|
|||
43 | tt.help_all_output_test("profile create") |
|
31 | tt.help_all_output_test("profile create") | |
44 |
|
32 | |||
45 | def test_locate_help(): |
|
33 | def test_locate_help(): | |
46 | tt.help_output_test("locate") |
|
|||
47 |
|
||||
48 | def test_locate_help_all(): |
|
|||
49 | tt.help_all_output_test("locate") |
|
34 | tt.help_all_output_test("locate") | |
50 |
|
35 | |||
51 | def test_locate_profile_help(): |
|
36 | def test_locate_profile_help(): | |
52 | tt.help_output_test("locate profile") |
|
|||
53 |
|
||||
54 | def test_locate_profile_all(): |
|
|||
55 | tt.help_all_output_test("locate profile") |
|
37 | tt.help_all_output_test("locate profile") |
General Comments 0
You need to be logged in to leave comments.
Login now