Rev 3322: bzrlib.tests.commands 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: 3322
revision-id: v.ladeuil+lp at free.fr-20080330215716-itlf2mxlf77hcgm0
parent: v.ladeuil+lp at free.fr-20080330215052-n3ie3iweogfas8oh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Sun 2008-03-30 23:57:16 +0200
message:
  bzrlib.tests.commands switched from test_suite() to load_tests().
  
  * bzrlib/tests/commands/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.commands moved from
  packages_to_test to testmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 21:50:52 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 21:57:16 +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.commands
     import bzrlib.tests.interrepository_implementations
     import bzrlib.tests.interversionedfile_implementations
     import bzrlib.tests.intertree_implementations
@@ -127,7 +126,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.commands,
             bzrlib.tests.interrepository_implementations,
             bzrlib.tests.interversionedfile_implementations,
             bzrlib.tests.intertree_implementations,
@@ -2657,6 +2655,7 @@
                    'bzrlib.tests.blackbox',
                    'bzrlib.tests.branch_implementations',
                    'bzrlib.tests.bzrdir_implementations',
+                   'bzrlib.tests.commands',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/commands/__init__.py'
--- a/bzrlib/tests/commands/__init__.py	2007-10-04 15:45:21 +0000
+++ b/bzrlib/tests/commands/__init__.py	2008-03-30 21:57:16 +0000
@@ -24,10 +24,11 @@
 # FIXME: If the separation described above from the blackbox tests is not worth
 # it, all the tests defined below should be moved to blackbox instead. 
 
-from bzrlib.tests import TestLoader
-
-
-def test_suite():
+def load_tests(basic_tests, module, loader):
+    suite = loader.suiteClass()
+    # add the tests for this module
+    suite.addTests(basic_tests)
+
     testmod_names = [
         'bzrlib.tests.commands.test_branch',
         'bzrlib.tests.commands.test_cat',
@@ -41,7 +42,6 @@
         'bzrlib.tests.commands.test_push',
         'bzrlib.tests.commands.test_update',
         ]
-    loader = TestLoader()
     suite = loader.loadTestsFromModuleNames(testmod_names)
 
     return suite