Commit 539a3229 authored by Paul Rich's avatar Paul Rich
Browse files

Merge branch 'develop' into 46-alps-bridge-pid-leak

parents 759f09b1 718cf298
......@@ -167,6 +167,9 @@ class BaseChild (object):
self.stderr_file = None
self._cobalt_log_file = None
self._cobalt_log_failed = False
self.use_stdout_string = state.get('stdout_string', False)
self.stdin_string = state.get('stdin_string', None)
self.stdout_string = state.get('stdout_string', '')
if not self.complete:
self.lost_child = True
self.return_output = False
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment