Rev 4813: Merge trunk (NEWS conflicts). in http://people.canonical.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4813 [merge]
revision-id: robertc at robertcollins.net-20091222234722-utqyjqu82cupnrd2
parent: robertc at robertcollins.net-20091222230950-39gjmost0lmu9ufg
parent: pqm at pqm.ubuntu.com-20091222232732-4ew4a6un9u59shqi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-12-23 10:47:22 +1100
message:
  Merge trunk (NEWS conflicts).
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2009-12-22 23:09:50 +0000
+++ b/NEWS	2009-12-22 23:47:22 +0000
@@ -72,6 +72,10 @@
   testtools less than 0.9.2 will cause bzr to error while loading the test
   suite. (Robert Collins)
 
+* The test progress bar no longer distinguishes tests that 'errored' from
+  tests that 'failed' - they're all just failures.
+  (Martin Pool)
+
 bzr 2.0.4 (not released yet)
 ############################
 

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-12-22 23:09:50 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-22 23:47:22 +0000
@@ -453,10 +453,9 @@
             a += '%dm%ds' % (runtime / 60, runtime % 60)
         else:
             a += '%ds' % runtime
-        if self.error_count:
-            a += ', %d err' % self.error_count
-        if self.failure_count:
-            a += ', %d fail' % self.failure_count
+        total_fail_count = self.error_count + self.failure_count
+        if total_fail_count:
+            a += ', %d failed' % total_fail_count
         # if self.unsupported:
         #     a += ', %d missing' % len(self.unsupported)
         a += ']'