Rev 3320: bzrlib.tests.branch_implementations switched from test_suite() to load_tests(). in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 3320
revision-id: v.ladeuil+lp at free.fr-20080330214913-o771cbgvsooqfb0h
parent: v.ladeuil+lp at free.fr-20080330214807-hclidcxuwfzq0cb8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Sun 2008-03-30 23:49:13 +0200
message:
  bzrlib.tests.branch_implementations switched from test_suite() to load_tests().
  
  * bzrlib/tests/branch_implementations/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.branch_implementations moved from
  packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 21:48:07 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 21:49:13 +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.branch_implementations
     import bzrlib.tests.bzrdir_implementations
     import bzrlib.tests.commands
     import bzrlib.tests.interrepository_implementations
@@ -129,7 +128,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.branch_implementations,
             bzrlib.tests.bzrdir_implementations,
             bzrlib.tests.commands,
             bzrlib.tests.interrepository_implementations,
@@ -2659,6 +2657,7 @@
                    'bzrlib.doc',
                    'bzrlib.util.tests.test_bencode',
                    'bzrlib.tests.blackbox',
+                   'bzrlib.tests.branch_implementations',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/branch_implementations/__init__.py'
--- a/bzrlib/tests/branch_implementations/__init__.py	2007-06-28 05:19:04 +0000
+++ b/bzrlib/tests/branch_implementations/__init__.py	2008-03-30 21:49:13 +0000
@@ -135,8 +135,11 @@
         return tree
 
 
-def test_suite():
-    result = tests.TestSuite()
+def load_tests(basic_tests, module, loader):
+    result = loader.suiteClass()
+    # add the tests for this module
+    result.addTests(basic_tests)
+
     test_branch_implementations = [
         'bzrlib.tests.branch_implementations.test_bound_sftp',
         'bzrlib.tests.branch_implementations.test_branch',
@@ -170,7 +173,6 @@
         # by the TestCaseWithTransport.get_readonly_transport method.
         None,
         combinations)
-    loader = tests.TestLoader()
     tests.adapt_modules(test_branch_implementations, adapter, loader, result)
 
     adapt_to_smart_server = BranchTestProviderAdapter(