summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-07-31 17:35:03 -0600
committerTom Rini <trini@konsulko.com>2016-08-05 20:55:19 -0400
commit7f64b1874c22b52259a8380de13d824e6b0ce2c8 (patch)
tree2847448aa07a743d3615f3742cec5c4557b50b66
parentbcbd0c8fe1bdd95f07d773d076b5101a01e48287 (diff)
test: Check exit status in run_and_log_expect_exception()
This check was missed. Add it and make the message more verbose. Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Tom Rini <trini@konsulko.com> Fixes: 9e17b034 (test/py: Provide a way to check that a command fails)
-rw-r--r--test/py/multiplexed_log.py2
-rw-r--r--test/py/u_boot_utils.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/test/py/multiplexed_log.py b/test/py/multiplexed_log.py
index 35a32fb5c05..bf926c3e776 100644
--- a/test/py/multiplexed_log.py
+++ b/test/py/multiplexed_log.py
@@ -102,6 +102,7 @@ class RunAndLog(object):
self.name = name
self.chained_file = chained_file
self.output = None
+ self.exit_status = None
def close(self):
"""Clean up any resources managed by this object."""
@@ -166,6 +167,7 @@ class RunAndLog(object):
# Store the output so it can be accessed if we raise an exception.
self.output = output
+ self.exit_status = exit_status
if exception:
raise exception
return output
diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py
index e358c585bf8..d71348f70e9 100644
--- a/test/py/u_boot_utils.py
+++ b/test/py/u_boot_utils.py
@@ -201,9 +201,11 @@ def run_and_log_expect_exception(u_boot_console, cmd, retcode, msg):
runner = u_boot_console.log.get_runner(cmd[0], sys.stdout)
runner.run(cmd)
except Exception as e:
+ assert(retcode == runner.exit_status)
assert(msg in runner.output)
else:
- raise Exception('Expected exception, but not raised')
+ raise Exception("Expected an exception with retcode %d message '%s',"
+ "but it was not raised" % (retcode, msg))
finally:
runner.close()