Browse Source

merge stderr into stdout for now...

This prevents allowing users to spam the controller's stderr...
In the future this may be forwarded as it's own stream...
main
John-Mark Gurney 4 years ago
parent
commit
44d7f2d940
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      bitelab/__init__.py

+ 4
- 2
bitelab/__init__.py View File

@@ -523,7 +523,8 @@ class HandleExec(WSFWDServer):
asyncio.create_subprocess_exec('jexec',
self._board_id, *msg['args'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
except BITEError as e:
raise RuntimeError(e.errobj.error)

@@ -835,7 +836,8 @@ class TestWebSocket(TestCommon):
await proc.wait()

cse.assert_called_with('jexec', 'cora-1', *cmdargs,
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)

# spin things, not sure best way to handle this
await asyncio.sleep(.01)


Loading…
Cancel
Save