summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-08-26 02:25:44 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-08-26 04:04:37 +0200
commit64564f7338107f781d814e7721e85cc882106c2b (patch)
treeacdc71d3a8ab555e633e29caae9e14899a80cf4f /selftest
parent3aab0c701caa885a1256b07ab5ca7f9a51c6018b (diff)
downloadsamba-64564f7338107f781d814e7721e85cc882106c2b.tar.gz
samba-64564f7338107f781d814e7721e85cc882106c2b.tar.bz2
samba-64564f7338107f781d814e7721e85cc882106c2b.zip
subunithelper: Pass along lines as normal output when ignoring them for not containing commands.
Diffstat (limited to 'selftest')
-rw-r--r--selftest/subunithelper.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index d2054a9498..d0bb0bb533 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -34,6 +34,7 @@ def parse_results(msg_ops, statistics, fh):
break
parts = l.split(None, 1)
if not len(parts) == 2 or not l.startswith(parts[0]):
+ msg_ops.output_msg(l)
continue
command = parts[0].rstrip(":")
arg = parts[1]
@@ -128,6 +129,9 @@ def parse_results(msg_ops, statistics, fh):
msg_ops.end_testsuite(testname, "xfail", reason)
elif result == "testsuite-error":
msg_ops.end_testsuite(testname, "error", reason)
+ else:
+ raise AssertionError("Recognized but unhandled result %r" %
+ result)
elif command == "testsuite":
msg_ops.start_testsuite(arg.strip())
elif command == "progress":