summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2018-02-22 12:46:47 +1300
committerKarolin Seeger <kseeger@samba.org>2018-08-21 16:10:23 +0200
commit50b081a609e03cd6cfda89ffb78c14ba1cbccdbc (patch)
treefe4c3da06c8b591517b2cae4789d15784944474b
parent9dcded330bfaa473f960cf33f50df9598cbe457f (diff)
downloadsamba-50b081a609e03cd6cfda89ffb78c14ba1cbccdbc.tar.gz
selftest: subunithelper needs to follow the subunit spec more closely
In particular allow ]\n without \n]\n as used by cmocka Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> (cherry picked from commit 7d79575de8e47a0ce03e30c3ea84176be696269f) Autobuild-User(v4-7-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-7-test): Tue Aug 21 16:10:23 CEST 2018 on sn-devel-144
-rw-r--r--selftest/subunithelper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index fab7d6f0b41..efc8bedcfcb 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -82,7 +82,8 @@ def parse_results(msg_ops, statistics, fh):
if l == "":
break
msg_ops.control_msg(l)
- if l == "]\n":
+ if l[-2:] == "]\n":
+ reason += l[:-2]
terminated = True
break
else: