From 44d7f2d9403f00ebe78e62d91749edb0e4f58a86 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Thu, 17 Dec 2020 15:41:42 -0800 Subject: [PATCH] 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... --- bitelab/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bitelab/__init__.py b/bitelab/__init__.py index d4d9228..f96fa83 100644 --- a/bitelab/__init__.py +++ b/bitelab/__init__.py @@ -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)