diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-30 21:31:41 +0100 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-09-29 16:34:56 +0100 |
commit | 6dc3acd5aa394aec2bf1dad29dea693abe89b55c (patch) | |
tree | d9298c05d37301aca92b53f9f9f09225b6d2ad96 | |
parent | bade7d9f4a69e1ff0b904d8e0d63f0815a1a0c5b (diff) |
-rw-r--r-- | framework/backends/compression.py | 2 | ||||
-rw-r--r-- | tests/xts.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/framework/backends/compression.py b/framework/backends/compression.py index 96565ecf1..da156b3b7 100644 --- a/framework/backends/compression.py +++ b/framework/backends/compression.py @@ -102,7 +102,7 @@ if six.PY2: try: with open(os.devnull, 'w') as d: subprocess.check_call(['xz', '--help'], stdout=d, stderr=d) - except OSError: + except (OSError, CalledProcessError): pass else: diff --git a/tests/xts.py b/tests/xts.py index 715ecfa47..bdd595cd6 100644 --- a/tests/xts.py +++ b/tests/xts.py @@ -99,6 +99,7 @@ class XTSTest(Test): # pylint: disable=too-few-public-methods self.testdir, self.testname) self.env.update({"TET_RESFILE": self.test_results_file}) + print('running', self._command) super(XTSTest, self).run() def _process_log_for_images(self, log): |