Rev 4642: Backport fix for selftest --starting-with in http://bazaar.launchpad.net/~vila/bzr/2.0-integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.0-integration

------------------------------------------------------------
revno: 4642 [merge]
revision-id: v.ladeuil+lp at free.fr-20090827145434-myro80izcesmixl5
parent: pqm at pqm.ubuntu.com-20090826181204-7tnwrg25c2zi1x51
parent: robertc at robertcollins.net-20090824203018-hwciwsm3dc3c1jeu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.0-integration
timestamp: Thu 2009-08-27 16:54:34 +0200
message:
  Backport fix for selftest --starting-with
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-08-24 05:23:11 +0000
+++ b/bzrlib/tests/__init__.py	2009-08-24 20:30:18 +0000
@@ -3230,6 +3230,9 @@
             keep_only = None
         else:
             keep_only = load_test_id_list(load_list)
+        if starting_with:
+            starting_with = [test_prefix_alias_registry.resolve_alias(start)
+                             for start in starting_with]
         if test_suite_factory is None:
             # Reduce loading time by loading modules based on the starting_with
             # patterns.
@@ -3608,8 +3611,6 @@
     if keep_only is not None:
         id_filter = TestIdList(keep_only)
     if starting_with:
-        starting_with = [test_prefix_alias_registry.resolve_alias(start)
-                         for start in starting_with]
         # We take precedence over keep_only because *at loading time* using
         # both options means we will load less tests for the same final result.
         def interesting_module(name):