diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-03-12 15:12:42 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2014-07-15 12:46:12 +0200 |
commit | 29ec8f4821c1dac41312c62e30823f6e00aeb3c4 (patch) | |
tree | 74c6661a10ed4197abd5f1493d9edee76d74d623 /selftest | |
parent | 484d746011be8c39e7a4827f555f3141e1ef5ea5 (diff) | |
download | samba-29ec8f4821c1dac41312c62e30823f6e00aeb3c4.tar.gz |
selftest/subunithelper.py: correctly pass testsuite-uxsuccess to end_testsuite()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Mar 13 23:49:36 CET 2014 on sn-devel-104
(cherry picked from commit 3632c59e250396b3974bccf7ad74cbe5c84fdba3)
The last 4 patches address bug #10696 - backport autobuild/selftest fixes from
master.
Diffstat (limited to 'selftest')
-rw-r--r-- | selftest/subunithelper.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 3f54d5ab92a..6f1fdcee127 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -24,7 +24,7 @@ import subunit.iso8601 import testtools from testtools import content, content_type -VALID_RESULTS = ['success', 'successful', 'failure', 'fail', 'skip', 'knownfail', 'error', 'xfail', 'skip-testsuite', 'testsuite-failure', 'testsuite-xfail', 'testsuite-success', 'testsuite-error', 'uxsuccess'] +VALID_RESULTS = ['success', 'successful', 'failure', 'fail', 'skip', 'knownfail', 'error', 'xfail', 'skip-testsuite', 'testsuite-failure', 'testsuite-xfail', 'testsuite-success', 'testsuite-error', 'uxsuccess', 'testsuite-uxsuccess'] class TestsuiteEnabledTestResult(testtools.testresult.TestResult): @@ -158,6 +158,9 @@ def parse_results(msg_ops, statistics, fh): exitcode = 1 elif result == "testsuite-xfail": msg_ops.end_testsuite(testname, "xfail", reason) + elif result == "testsuite-uxsuccess": + msg_ops.end_testsuite(testname, "uxsuccess", reason) + exitcode = 1 elif result == "testsuite-error": msg_ops.end_testsuite(testname, "error", reason) exitcode = 1 |