Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make TestProcess.communicate return str instead of IO object

Browse Source
This commit is contained in:
WillyPillow 2020-09-07 01:18:59 +08:00
parent 3f75e6e49e
commit 5e1e0daa5c
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubesadmin/tests/__init__.py
View File

@ -60,11 +60,13 @@ class TestProcess(object):
self.stdin_close = self.stdin.close self.stdin_close = self.stdin.close
self.stdin.close = self.store_input self.stdin.close = self.store_input
self.stdin.flush = self.store_input self.stdin.flush = self.store_input
if stdout == subprocess.PIPE: if stdout == subprocess.PIPE or stdout == subprocess.DEVNULL \
or stdout is None:
self.stdout = io.BytesIO() self.stdout = io.BytesIO()
else: else:
self.stdout = stdout self.stdout = stdout
if stderr == subprocess.PIPE: if stderr == subprocess.PIPE or stderr == subprocess.DEVNULL \
or stderr is None:
self.stderr = io.BytesIO() self.stderr = io.BytesIO()
else: else:
self.stderr = stderr self.stderr = stderr
@ -82,7 +84,7 @@ class TestProcess(object):
self.stdin.write(input) self.stdin.write(input)
self.stdin.close() self.stdin.close()
self.stdin_close() self.stdin_close()
return self.stdout, self.stderr return self.stdout.read(), self.stderr.read()
def wait(self): def wait(self):
self.stdin_close() self.stdin_close()