summaryrefslogtreecommitdiffstats
path: root/selftest
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-03-12 15:12:42 +0100
committerJeremy Allison <jra@samba.org>2014-03-13 23:49:35 +0100
commit3632c59e250396b3974bccf7ad74cbe5c84fdba3 (patch)
tree9d83e3e42c91362932e6d7df6cceba1503773b1a /selftest
parentfee156f5b9235b5f766cb773433ddb7d0ccd98a1 (diff)
downloadsamba-3632c59e250396b3974bccf7ad74cbe5c84fdba3.tar.gz
samba-3632c59e250396b3974bccf7ad74cbe5c84fdba3.tar.xz
samba-3632c59e250396b3974bccf7ad74cbe5c84fdba3.zip
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
Diffstat (limited to 'selftest')
-rw-r--r--selftest/subunithelper.py5
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