Rev 3406: (robertc) Preserve test ids correctly to aid debugging. (Robert in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3406
revision-id:pqm at pqm.ubuntu.com-20080505041432-g51fjlrfth74arug
parent: pqm at pqm.ubuntu.com-20080502230043-zwk3y5idlir4uak1
parent: robertc at robertcollins.net-20080505020610-mqsdf2sb5hc4jtap
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-05-05 05:14:32 +0100
message:
  (robertc) Preserve test ids correctly to aid debugging. (Robert
  	Collins, Andrew Bennetts)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3405.1.1
    revision-id:robertc at robertcollins.net-20080505020610-mqsdf2sb5hc4jtap
    parent: pqm at pqm.ubuntu.com-20080502230043-zwk3y5idlir4uak1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2008-05-05 12:06:10 +1000
    message:
      (robertc) Preserve test ids correctly to aid debugging. (Robert Collins, Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2008-05-02 23:00:43 +0000
+++ b/NEWS	2008-05-05 02:06:10 +0000
@@ -83,6 +83,9 @@
       make it easy to identify which test spawned a thread with an unhandled
       exception. (Andrew Bennetts)
 
+    * Parameterised test ids are preserved correctly to aid diagnosis of test
+      failures. (Robert Collins, Andrew Bennetts)
+
   INTERNALS:
 
     * ``Hooks.install_hook`` is now deprecated in favour of

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-04-30 08:05:17 +0000
+++ b/bzrlib/tests/__init__.py	2008-05-05 02:06:10 +0000
@@ -784,7 +784,7 @@
     _keep_log_file = False
     # record lsprof data when performing benchmark calls.
     _gather_lsprof_in_benchmarks = False
-    attrs_to_keep = ('_testMethodName', '_testMethodDoc',
+    attrs_to_keep = ('id', '_testMethodName', '_testMethodDoc',
                      '_log_contents', '_log_file_name', '_benchtime',
                      '_TestCase__testMethodName')