Rev 4919: (mbp) Test progress bar now lumps together tests that error and those in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4919 [merge]
revision-id: pqm at pqm.ubuntu.com-20091222232732-4ew4a6un9u59shqi
parent: pqm at pqm.ubuntu.com-20091222181820-qfolh2sy2nevoxxj
parent: mbp at sourcefrog.net-20091222054132-0z1sz4dix6479x20
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-12-22 23:27:32 +0000
message:
  (mbp) Test progress bar now lumps together tests that error and those
  	that fail
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2009-12-22 18:18:20 +0000
+++ b/NEWS	2009-12-22 23:27:32 +0000
@@ -60,6 +60,10 @@
 Testing
 *******
 
+* 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 15:37:23 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-22 23:27:32 +0000
@@ -468,10 +468,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 += ']'