From fee156f5b9235b5f766cb773433ddb7d0ccd98a1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 12 Mar 2014 15:12:42 +0100 Subject: [PATCH] selftest/subunithelper.py: correctly handle fail_immediately in end_testsuite of FilterOps This way --fail-immediately also works if a command segfaults. Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- selftest/subunithelper.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 8b10016bb85..3f54d5ab92a 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -393,6 +393,12 @@ class FilterOps(testtools.testresult.TestResult): reason += "\n errors[%d]" % self.error_added self._ops.end_testsuite(name, result, reason) + if result not in ("success", "xfail"): + if self.output: + self._ops.output_msg(self.output) + if self.fail_immediately: + raise ImmediateFail() + self.output = None def __init__(self, out, prefix=None, suffix=None, expected_failures=None, strip_ok_output=False, fail_immediately=False, -- 2.34.1