Rev 4726: (vila) Disambiguate per_transport test IDs in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4726 [merge]
revision-id: pqm at pqm.ubuntu.com-20091005154135-k407ea8ssyhayv10
parent: pqm at pqm.ubuntu.com-20091002180105-oeomf71t7l9gpv6g
parent: v.ladeuil+lp at free.fr-20091005145447-hcembfu9srlfd6mg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-10-05 16:41:35 +0100
message:
  (vila) Disambiguate per_transport test IDs
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/per_transport.py  test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'NEWS'
--- a/NEWS	2009-10-02 16:48:36 +0000
+++ b/NEWS	2009-10-05 12:50:34 +0000
@@ -194,6 +194,10 @@
   documentation in ``developers/testing.txt`` for details.
   (Vincent Ladeuil)
 
+* Some tests could end up with the same id, that was dormant for
+  a long time.
+  (Vincent Ladeuil, #442980)
+
 * Stop showing the number of tests due to missing features in the test
   progress bar.  (Martin Pool)
 

=== modified file 'bzrlib/tests/per_transport.py'
--- a/bzrlib/tests/per_transport.py	2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_transport.py	2009-10-05 12:50:34 +0000
@@ -79,7 +79,7 @@
             permutations = get_transport_test_permutations(
                 reduce(getattr, (module).split('.')[1:], __import__(module)))
             for (klass, server_factory) in permutations:
-                scenario = (server_factory.__name__,
+                scenario = ('%s,%s' % (klass.__name__, server_factory.__name__),
                     {"transport_class":klass,
                      "transport_server":server_factory})
                 result.append(scenario)

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-09-18 10:32:34 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-10-05 12:50:34 +0000
@@ -2858,7 +2858,7 @@
             # testmod_names
             'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
             ('bzrlib.tests.per_transport.TransportTests'
-             '.test_abspath(LocalURLServer)'),
+             '.test_abspath(LocalTransport,LocalURLServer)'),
             'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
             # modules_to_doctest
             'bzrlib.timestamp.format_highres_date',