Rev 3318: bzrlib.doc switch 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: 3318
revision-id: v.ladeuil+lp at free.fr-20080330204644-wiq6m2fvy6j8hfm4
parent: v.ladeuil+lp at free.fr-20080330202917-7hmib6yzp33v81to
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Sun 2008-03-30 22:46:44 +0200
message:
  bzrlib.doc switch from test_suite() to load_tests().
  
  * bzrlib/tests/__init__.py:
  (test_suite): bzrlib.doc moves from packages_to_test to
  tesmod_names.
  
  * bzrlib/doc/__init__.py: 
  * bzrlib/doc/api/__init__.py: 
  (load_tests): Preferred to test_suite().
modified:
  bzrlib/doc/__init__.py         __init__.py-20051224020731-eb3eb3ef5b4570df
  bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/doc/__init__.py'
--- a/bzrlib/doc/__init__.py	2006-10-05 05:37:25 +0000
+++ b/bzrlib/doc/__init__.py	2008-03-30 20:46:44 +0000
@@ -20,7 +20,16 @@
 for man page generation.
 """
 
-    
-def test_suite():
-    import bzrlib.doc.api
-    return bzrlib.doc.api.test_suite()
+
+def load_tests(basic_tests, module, loader):
+    suite = loader.suiteClass()
+    # add the tests for this module (obviously none so far)
+    suite.addTests(basic_tests)
+
+    testmod_names = [
+        'bzrlib.doc.api',
+        ]
+
+    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
+
+    return suite

=== modified file 'bzrlib/doc/api/__init__.py'
--- a/bzrlib/doc/api/__init__.py	2008-03-24 14:35:46 +0000
+++ b/bzrlib/doc/api/__init__.py	2008-03-30 20:46:44 +0000
@@ -29,7 +29,9 @@
 
 from bzrlib import tests
 
-def test_suite():
+def load_tests(basic_tests, module, loader):
+    """This module creates its own test suite with DocFileSuite."""
+
     dir_ = os.path.dirname(__file__)
     if os.path.isdir(dir_):
         candidates = os.listdir(dir_)

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-03-30 20:28:52 +0000
+++ b/bzrlib/tests/__init__.py	2008-03-30 20:46:44 +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.doc
     import bzrlib.tests.blackbox
     import bzrlib.tests.branch_implementations
     import bzrlib.tests.bzrdir_implementations
@@ -131,7 +130,6 @@
     import bzrlib.tests.tree_implementations
     import bzrlib.tests.workingtree_implementations
     return [
-            bzrlib.doc,
             bzrlib.tests.blackbox,
             bzrlib.tests.branch_implementations,
             bzrlib.tests.bzrdir_implementations,
@@ -2660,6 +2658,7 @@
     suite on a global basis, but it is not encouraged.
     """
     testmod_names = [
+                   'bzrlib.doc',
                    'bzrlib.util.tests.test_bencode',
                    'bzrlib.tests.test__dirstate_helpers',
                    'bzrlib.tests.test_ancestry',