Rev 4644: (robertc) Fix minor test-support regression with -s aliases. (Robert in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4644 [merge]
revision-id: pqm at pqm.ubuntu.com-20090825030737-d5xkv49mwu0e8zn6
parent: pqm at pqm.ubuntu.com-20090825020045-pvd7lwj0i18piq51
parent: robertc at robertcollins.net-20090824203018-hwciwsm3dc3c1jeu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-08-25 04:07:37 +0100
message:
  (robertc) Fix minor test-support regression with -s aliases. (Robert
  	Collins)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== 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):