aboutsummaryrefslogtreecommitdiffstats
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-23 10:38:28 +0200
commit84b786553799c494c77aefc03f44f4e10afb35d0 (patch)
treebafbefcbded0e1b41f9ccdcd956fb9e9817bfb4d
parentfd137bc1073c4d3110c356e6778c73f5cda884aa (diff)
downloadsamba-84b786553799c494c77aefc03f44f4e10afb35d0.tar.gz
samba-84b786553799c494c77aefc03f44f4e10afb35d0.tar.xz
samba-84b786553799c494c77aefc03f44f4e10afb35d0.zip
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)
-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: