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

Vincent Ladeuil v.ladeuil+lp at free.fr
Sun Mar 30 23:02:43 BST 2008


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

------------------------------------------------------------
revno: 3323
revision-id: v.ladeuil+lp at free.fr-20080330220238-xzv9sf0z3wnzybaq
parent: v.ladeuil+lp at free.fr-20080330215716-itlf2mxlf77hcgm0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Mon 2008-03-31 00:02:38 +0200
message:
  bzrlib.tests.interrepository_implementations switched from test_suite()
  to load_tests().
  
  * bzrlib/tests/interrepository_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.interrepository_implementations moved
  from packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 21:57:16 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 22:02:38 +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.interrepository_implementations
     import bzrlib.tests.interversionedfile_implementations
     import bzrlib.tests.intertree_implementations
     import bzrlib.tests.inventory_implementations
@@ -126,7 +125,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.interrepository_implementations,
             bzrlib.tests.interversionedfile_implementations,
             bzrlib.tests.intertree_implementations,
             bzrlib.tests.inventory_implementations,
@@ -2656,6 +2654,7 @@
                    'bzrlib.tests.branch_implementations',
                    'bzrlib.tests.bzrdir_implementations',
                    'bzrlib.tests.commands',
+                   'bzrlib.tests.interrepository_implementations',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/interrepository_implementations/__init__.py'
--- a/bzrlib/tests/interrepository_implementations/__init__.py	2008-03-24 15:44:44 +0000
+++ b/bzrlib/tests/interrepository_implementations/__init__.py	2008-03-30 22:02:38 +0000
@@ -34,9 +34,7 @@
 from bzrlib.tests import (
                           adapt_modules,
                           default_transport,
-                          TestLoader,
                           TestScenarioApplier,
-                          TestSuite,
                           )
 
 
@@ -119,8 +117,11 @@
         return result
 
 
-def test_suite():
-    result = TestSuite()
+def load_tests(basic_tests, module, loader):
+    result = loader.suiteClass()
+    # add the tests for this module
+    result.addTests(basic_tests)
+
     test_interrepository_implementations = [
         'bzrlib.tests.interrepository_implementations.test_interrepository',
         ]
@@ -131,6 +132,5 @@
         None,
         InterRepositoryTestProviderAdapter.default_test_list()
         )
-    loader = TestLoader()
     adapt_modules(test_interrepository_implementations, adapter, loader, result)
     return result



More information about the bazaar-commits mailing list