Rev 3325: bzrlib.tests.intertree_implementations switched from test_suite() in file:///v/home/vila/src/bzr/experimental/faster-selftest/

Vincent Ladeuil v.ladeuil+lp at free.fr
Mon Mar 31 16:08:25 BST 2008


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

------------------------------------------------------------
revno: 3325
revision-id: v.ladeuil+lp at free.fr-20080331150821-2iwknnd0f8h9fmlv
parent: v.ladeuil+lp at free.fr-20080330221056-jm3m65e78c5fusgk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Mon 2008-03-31 17:08:21 +0200
message:
  bzrlib.tests.intertree_implementations switched from test_suite()
  to load_tests().
  
  * bzrlib/tests/intertree_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.intertree_implementations moved from
  packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 22:10:56 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-31 15:08:21 +0000
@@ -116,7 +116,6 @@
     The packages are not globally imported so that import failures are
     triggered when running selftest, not when importing the command.
     """
-    import bzrlib.tests.intertree_implementations
     import bzrlib.tests.inventory_implementations
     import bzrlib.tests.per_lock
     import bzrlib.tests.repository_implementations
@@ -124,7 +123,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.intertree_implementations,
             bzrlib.tests.inventory_implementations,
             bzrlib.tests.per_lock,
             bzrlib.tests.repository_implementations,
@@ -2653,6 +2651,7 @@
                    'bzrlib.tests.bzrdir_implementations',
                    'bzrlib.tests.commands',
                    'bzrlib.tests.interrepository_implementations',
+                   'bzrlib.tests.intertree_implementations',
                    'bzrlib.tests.interversionedfile_implementations',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',

=== modified file 'bzrlib/tests/intertree_implementations/__init__.py'
--- a/bzrlib/tests/intertree_implementations/__init__.py	2007-06-28 07:15:28 +0000
+++ b/bzrlib/tests/intertree_implementations/__init__.py	2008-03-31 15:08:21 +0000
@@ -27,8 +27,6 @@
 from bzrlib.tests import (
                           adapt_modules,
                           default_transport,
-                          TestLoader,
-                          TestSuite,
                           )
 from bzrlib.tests.tree_implementations import (
     return_parameter,
@@ -95,11 +93,10 @@
         return result
 
 
-def test_suite():
-    result = TestSuite()
-    loader = TestLoader()
+def load_tests(basic_tests, module, loader):
+    result = loader.suiteClass()
     # load the tests of the infrastructure for these tests
-    result.addTests(loader.loadTestsFromModuleNames(['bzrlib.tests.intertree_implementations']))
+    result.addTests(basic_tests)
 
     default_tree_format = WorkingTreeFormat3()
     test_intertree_implementations = [



More information about the bazaar-commits mailing list