From dffa6fa25a020919d7ddc8fe56e61ec19c136a9b Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 16 Jun 2020 18:46:27 +0100 Subject: [PATCH] tests: Be compatible with Python 3.4 on host SteamOS 2 'brewmaster' only has this. Signed-off-by: Simon McVittie <smcv@collabora.com> --- tests/containers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/containers.py b/tests/containers.py index 7be681096..ae474cfc4 100755 --- a/tests/containers.py +++ b/tests/containers.py @@ -117,7 +117,7 @@ class TestContainers(BaseTest): bwrap = os.environ.get('BWRAP', shutil.which('bwrap')) - if bwrap is not None and subprocess.run( + if bwrap is not None and run_subprocess( [bwrap, '--dev-bind', '/', '/', 'sh', '-c', 'true'], stdout=2, stderr=2, @@ -256,7 +256,7 @@ class TestContainers(BaseTest): os.path.join(cls.artifacts, 'host-srsi.json'), 'w', ) as writer: - subprocess.run( + run_subprocess( [ host_srsi, '--verbose', @@ -369,7 +369,7 @@ class TestContainers(BaseTest): with tee_file_and_stderr( os.path.join(artifacts, 'inside-scout.log') ) as tee: - completed = subprocess.run( + completed = self.run_subprocess( argv, cwd=self.artifacts, stdout=tee.stdin, -- GitLab