diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-08-26 03:50:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-08-26 04:04:37 +0200 |
| commit | 3c7a7bbb9a6258744523f41935f3967e48056787 (patch) | |
| tree | fab3ee5f6e950a11d7a8316a4f50c9eb3ac3de6e | |
| parent | e260965929563daad9464c599732b2ab358c9dc5 (diff) | |
| download | samba-3c7a7bbb9a6258744523f41935f3967e48056787.tar.gz samba-3c7a7bbb9a6258744523f41935f3967e48056787.tar.bz2 samba-3c7a7bbb9a6258744523f41935f3967e48056787.zip | |
subunit: Make sure "]" in failure reason ends up on its own line, so the
next subunit parser in the line parses it correctly.
| -rw-r--r-- | selftest/Subunit.pm | 9 | ||||
| -rw-r--r-- | selftest/subunithelper.py | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm index 42a9ad08aa..d5c8277fca 100644 --- a/selftest/Subunit.pm +++ b/selftest/Subunit.pm @@ -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"; diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index d0bb0bb533..06e1fc2edc 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -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) |