Rev 3319: bzrlib.tests.blackbox 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: 3319
revision-id: v.ladeuil+lp at free.fr-20080330214807-hclidcxuwfzq0cb8
parent: v.ladeuil+lp at free.fr-20080330204644-wiq6m2fvy6j8hfm4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Sun 2008-03-30 23:48:07 +0200
message:
  bzrlib.tests.blackbox switched from test_suite() to load_tests().
  
  * bzrlib/tests/blackbox/__init__.py:
  (load_tests): Preferred to test_suite().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.tests.blackbox moved from packages_to_test to
  tesmod_names.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 20:46:44 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 21:48:07 +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.blackbox
     import bzrlib.tests.branch_implementations
     import bzrlib.tests.bzrdir_implementations
     import bzrlib.tests.commands
@@ -130,7 +129,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.tests.blackbox,
             bzrlib.tests.branch_implementations,
             bzrlib.tests.bzrdir_implementations,
             bzrlib.tests.commands,
@@ -2660,6 +2658,7 @@
     testmod_names = [
                    'bzrlib.doc',
                    'bzrlib.util.tests.test_bencode',
+                   'bzrlib.tests.blackbox',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',

=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- a/bzrlib/tests/blackbox/__init__.py	2008-03-08 16:35:28 +0000
+++ b/bzrlib/tests/blackbox/__init__.py	2008-03-30 21:48:07 +0000
@@ -27,8 +27,6 @@
 from bzrlib.tests import (
                           adapt_modules,
                           TestCaseWithTransport,
-                          TestSuite,
-                          TestLoader,
                           iter_suite_tests,
                           )
 from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
@@ -39,7 +37,11 @@
 import bzrlib.ui as ui
 
 
-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.blackbox.test_add',
                      'bzrlib.tests.blackbox.test_added',
@@ -115,13 +117,12 @@
                      'bzrlib.tests.blackbox.test_versioning',
                      'bzrlib.tests.blackbox.test_whoami',
                      ]
+    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
+
     test_encodings = [
         'bzrlib.tests.blackbox.test_non_ascii',
     ]
 
-    loader = TestLoader()
-    suite = loader.loadTestsFromModuleNames(testmod_names) 
-
     adapter = EncodingTestAdapter()
     adapt_modules(test_encodings, adapter, loader, suite)