Rev 3317: Fix wrong conflict resolution. loom-newbie error. in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/experimental/faster-selftest/

------------------------------------------------------------
revno: 3317
revision-id: v.ladeuil+lp at free.fr-20080326084201-5nk05zka1xnoua90
parent: v.ladeuil+lp at free.fr-20080326084115-uw91u4rgwg40zkri
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Wed 2008-03-26 09:42:01 +0100
message:
  Fix wrong conflict resolution. loom-newbie error.
  
  * bzrlib/tests/__init__.py:
  (test_suite): Fix wrong conflict resolution.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-24 22:04:05 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-26 08:42:01 +0000
@@ -2832,14 +2832,6 @@
             pack_suite = filter_suite_by_id_list(pack_suite, id_filter)
         suite.addTest(pack_suite)
 
-    # XXX: MODULES_TO_TEST should be obsoleted ?
-    for mod in [m for m in MODULES_TO_TEST
-                if keep_only is None or id_filter.refers_to(m)]:
-        mod_suite = loader.loadTestsFromModule(mod)
-        if keep_only is not None:
-            mod_suite = filter_suite_by_id_list(mod_suite, id_filter)
-        suite.addTest(mod_suite)
-
     for mod in MODULES_TO_DOCTEST:
         try:
             doc_suite = doctest.DocTestSuite(mod)