mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-28 21:07:56 +00:00
Merge Fix inconsistent return length.
Correct issue discussed in !889. MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/890 Approved-by: Christian Boltz <apparmor@cboltz.de> Merged-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
commit
08da556e4e
@ -96,7 +96,7 @@ class AATestTemplate(unittest.TestCase, metaclass=AANoCleanupMetaClass):
|
|||||||
sp = subprocess.Popen(command, stdin=stdin, stdout=stdout, stderr=stderr,
|
sp = subprocess.Popen(command, stdin=stdin, stdout=stdout, stderr=stderr,
|
||||||
close_fds=True, preexec_fn=subprocess_setup, universal_newlines=True)
|
close_fds=True, preexec_fn=subprocess_setup, universal_newlines=True)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
return 127, str(e)
|
return 127, str(e), ''
|
||||||
|
|
||||||
timeout_communicate = TimeoutFunction(sp.communicate, timeout)
|
timeout_communicate = TimeoutFunction(sp.communicate, timeout)
|
||||||
out, outerr = (None, None)
|
out, outerr = (None, None)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user