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

tests: improve TestProcess behavior

Browse Source 
- Have it actually write to the given stdout handle.
- Return the return code for `poll` instead of returning `None`, so that
the process is observed to terminate.
This commit is contained in:
WillyPillow 2021-03-02 15:01:54 +08:00
parent 4083b74284
commit 64e9c24054
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubesadmin/tests/__init__.py
View File

@ -52,7 +52,7 @@ class TestVMCollection(dict):
class TestProcess(object): class TestProcess(object):
def __init__(self, input_callback=None, stdout=None, stderr=None): def __init__(self, input_callback=None, stdout=None, stderr=None, stdout_data=None):
self.input_callback = input_callback self.input_callback = input_callback
self.got_any_input = False self.got_any_input = False
self.stdin = io.BytesIO() self.stdin = io.BytesIO()
@ -70,6 +70,10 @@ class TestProcess(object):
self.stderr = io.BytesIO() self.stderr = io.BytesIO()
else: else:
self.stderr = stderr self.stderr = stderr
if stdout_data:
self.stdout.write(stdout_data)
# Seek to head so that it can be read later
self.stdout.seek(0)
self.returncode = 0 self.returncode = 0
def store_input(self): def store_input(self):
@ -91,7 +95,7 @@ class TestProcess(object):
return 0 return 0
def poll(self): def poll(self):
return None return self.returncode
class _AssertNotRaisesContext(object): class _AssertNotRaisesContext(object):
@ -167,11 +171,12 @@ class QubesTest(qubesadmin.app.QubesBase):
# raise AssertionError('Unexpected service call {!r}'.format(call_key)) # raise AssertionError('Unexpected service call {!r}'.format(call_key))
if call_key in self.expected_service_calls: if call_key in self.expected_service_calls:
kwargs = kwargs.copy() kwargs = kwargs.copy()
kwargs['stdout'] = io.BytesIO(self.expected_service_calls[call_key]) kwargs['stdout_data'] = self.expected_service_calls[call_key]
return TestProcess(lambda input: self.service_calls.append((dest, return TestProcess(lambda input: self.service_calls.append((dest,
service, input)), service, input)),
stdout=kwargs.get('stdout', None), stdout=kwargs.get('stdout', None),
stderr=kwargs.get('stderr', None), stderr=kwargs.get('stderr', None),
stdout_data=kwargs.get('stdout_data', None),
) )