sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

subunit: Make sure "]" in failure reason ends up on its own line, so the

Browse Source 
next subunit parser in the line parses it correctly.
This commit is contained in:
Jelmer Vernooij 2010-08-26 03:50:08 +02:00
parent e260965929
commit 3c7a7bbb9a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
selftest/Subunit.pm
View File

@ -52,8 +52,8 @@ sub parse_results($$$)
unless ($terminated) {
$statistics->{TESTS_ERROR}++;
$msg_ops->end_test($testname, "error", 1,
"reason ($result) interrupted");
$msg_ops->end_test($testname, "error", 1,
"reason ($result) interrupted\n");
return 1;
}
}
@ -102,7 +102,7 @@ sub parse_results($$$)
while ($#$open_tests+1 > 0) {
$msg_ops->end_test(pop(@$open_tests), "error", 1,
"was started but never finished!");
"was started but never finished!\n");
$statistics->{TESTS_ERROR}++;
}
@ -132,7 +132,8 @@ sub end_test($$;$)
my $reason = shift;
if ($reason) {
print "$result: $name [\n";
print "$reason";
print $reason;
if (substr($reason, -1, 1) != "\n") { print "\n"; }
print "]\n";
} else {
print "$result: $name\n";

4
selftest/subunithelper.py
View File

@ -66,7 +66,7 @@ def parse_results(msg_ops, statistics, fh):
break
else:
reason += l
if not terminated:
statistics['TESTS_ERROR']+=1
msg_ops.end_test(testname, "error", True,
@ -167,7 +167,7 @@ class SubunitOps(object):
def end_test(self, name, result, reason=None):
if reason:
print "%s: %s [" % (result, name)
print "%s" % reason
print reason
print "]"
else:
print "%s: %s" % (result, name)