From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 21 Feb 2018 23:46:47 +0000 (+1300)
Subject: selftest: subunithelper needs to follow the subunit spec more closely
X-Git-Tag: samba-4.8.5~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84b786553799c494c77aefc03f44f4e10afb35d0;p=thirdparty%2Fsamba.git

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)
---

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: