Skip to content

Commit 97d10d4

Browse files
authored
Merge pull request #427 from edisongustavo/dont-redirect-output-on-subprocesses-without-nose-machinery
Don't redirect stdout if nose machinery is not present
2 parents f32e188 + f1df72c commit 97d10d4

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

ipykernel/tests/utils.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ def start_new_kernel(**kwargs):
3333
3434
Integrates with our output capturing for tests.
3535
"""
36+
kwargs['stderr'] = STDOUT
3637
try:
37-
stdout = nose.iptest_stdstreams_fileno()
38+
kwargs['stdout'] = nose.iptest_stdstreams_fileno()
3839
except AttributeError:
39-
stdout = open(os.devnull)
40-
kwargs.update(dict(stdout=stdout, stderr=STDOUT))
40+
pass
4141
return manager.start_new_kernel(startup_timeout=STARTUP_TIMEOUT, **kwargs)
4242

4343

@@ -131,8 +131,11 @@ def new_kernel(argv=None):
131131
-------
132132
kernel_client: connected KernelClient instance
133133
"""
134-
stdout = getattr(nose, 'iptest_stdstreams_fileno', open(os.devnull))
135-
kwargs = dict(stdout=stdout, stderr=STDOUT)
134+
kwargs = {'stderr': STDOUT}
135+
try:
136+
kwargs['stdout'] = nose.iptest_stdstreams_fileno()
137+
except AttributeError:
138+
pass
136139
if argv is not None:
137140
kwargs['extra_arguments'] = argv
138141
return manager.run_kernel(**kwargs)

0 commit comments

Comments
 (0)