Update to newer version of subunit.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Oct 13 20:37:18 CEST 2011 on sn-devel-104

3 files changed, 10 insertions, 1 deletions

diff --git a/lib/subunit/NEWS b/lib/subunit/NEWS
index f91b11a00e..2edf7369d9 100644
--- a/lib/subunit/NEWS
+++ b/lib/subunit/NEWS
@@ -26,9 +26,13 @@ IMPROVEMENTS
 * Force flush of writes to stdout in c/tests/test_child.
   (Jelmer Vernooij, #687611)
 
+* Perl module now correctly outputs "failure" instead of "fail".  (Stewart Smith)
+
 * Provisional Python 3.x support.
   (Robert Collins, Tres Seaver, Martin[gz], #666819)
 
+* Shell functions now output timestamps. (Stewart Smith)
+
 * ``subunit.chunked.Decoder`` Python class takes a new ``strict`` option,
   which defaults to ``True``. When ``False``, the ``Decoder`` will accept
   incorrect input that is still unambiguous. i.e. subunit will not barf if
diff --git a/lib/subunit/perl/lib/Subunit.pm b/lib/subunit/perl/lib/Subunit.pm
index dac4a2601d..72aa1ebd66 100644
--- a/lib/subunit/perl/lib/Subunit.pm
+++ b/lib/subunit/perl/lib/Subunit.pm
@@ -135,7 +135,7 @@ sub fail_test($;$)
 {
 	my $name = shift;
 	my $reason = shift;
-	end_test($name, "fail", $reason);
+	end_test($name, "failure", $reason);
 }
 
 sub success_test($;$)
diff --git a/lib/subunit/shell/share/subunit.sh b/lib/subunit/shell/share/subunit.sh
index 82737276b8..a532388252 100644
--- a/lib/subunit/shell/share/subunit.sh
+++ b/lib/subunit/shell/share/subunit.sh
@@ -16,12 +16,14 @@
 
 subunit_start_test () {
   # emit the current protocol start-marker for test $1
+  echo "time: `date -u '+%Y-%m-%d %H:%M:%SZ'`"
   echo "test: $1"
 }
 
 
 subunit_pass_test () {
   # emit the current protocol test passed marker for test $1
+  echo "time: `date -u '+%Y-%m-%d %H:%M:%SZ'`"
   echo "success: $1"
 }
 
@@ -31,6 +33,7 @@ subunit_fail_test () {
   # the error text.
   # we use stdin because the failure message can be arbitrarily long, and this
   # makes it convenient to write in scripts (using <<END syntax.
+  echo "time: `date -u '+%Y-%m-%d %H:%M:%SZ'`"
   echo "failure: $1 ["
   cat -
   echo "]"
@@ -42,6 +45,7 @@ subunit_error_test () {
   # the error text.
   # we use stdin because the failure message can be arbitrarily long, and this
   # makes it convenient to write in scripts (using <<END syntax.
+  echo "time: `date -u '+%Y-%m-%d %H:%M:%SZ'`"
   echo "error: $1 ["
   cat -
   echo "]"
@@ -50,6 +54,7 @@ subunit_error_test () {
 
 subunit_skip_test () {
   # emit the current protocol test skipped marker for test $1
+  echo "time: `date -u '+%Y-%m-%d %H:%M:%SZ'`"
   echo "skip: $1"
 }