Rev 3329: Fixed as per Robert's review. in file:///v/home/vila/src/bzr/experimental/faster-selftest/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 3329
revision-id: v.ladeuil+lp at free.fr-20080402134513-xfj7652jfsxg6hwh
parent: v.ladeuil+lp at free.fr-20080401094234-ied49b94be3tiwlq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Wed 2008-04-02 15:45:13 +0200
message:
  Fixed as per Robert's review.
  
  * bzrlib/tests/test_plugins.py:
  (TestPlugins.test_no_load_plugin_tests_gives_None_for_load_plugin_tests,
  TestPlugins.test_load_plugin_tests_gives_load_plugin_tests_result):
  Updated.
  
  * bzrlib/tests/__init__.py:
  (test_suite): Use load_plugin_tests for plugins.
  
  * bzrlib/plugin.py:
  (PlugIn.load_plugin_tests): Renamed from load_tests to avoid
  confusion disambiguate with the load_tests function defined in
  test modules and plugin modules.
modified:
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
-------------- next part --------------
=== modified file 'bzrlib/plugin.py'
--- a/bzrlib/plugin.py	2008-03-26 11:29:40 +0000
+++ b/bzrlib/plugin.py	2008-04-02 13:45:13 +0000
@@ -407,15 +407,12 @@
         else:
             return None
 
-    def load_tests(self, loader):
+    def load_plugin_tests(self, loader):
         """Return the adapted plugin's test suite.
 
         :param loader: The custom loader that should be used to load additional
             tests.
 
-        Note that TestUtil.TestLoader defines load_tests(self, standard_tests,
-        module, loader), but here we are handling the associated plugin module
-        ourselves.
         """
         if getattr(self.module, 'load_tests', None) is not None:
             return loader.loadTestsFromModule(self.module)

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-04-01 08:39:30 +0000
+++ b/bzrlib/tests/__init__.py	2008-04-02 13:45:13 +0000
@@ -2854,7 +2854,7 @@
         # but really if you don't have --no-plugins this should be a failure.
         # mbp 20080213 - see http://bugs.launchpad.net/bugs/189771
         if plugin_suite is None:
-            plugin_suite = plugin.load_tests(loader)
+            plugin_suite = plugin.load_plugin_tests(loader)
         if plugin_suite is not None:
             suite.addTest(plugin_suite)
         if default_encoding != sys.getdefaultencoding():

=== modified file 'bzrlib/tests/test_plugins.py'
--- a/bzrlib/tests/test_plugins.py	2008-03-26 11:29:40 +0000
+++ b/bzrlib/tests/test_plugins.py	2008-04-02 13:45:13 +0000
@@ -286,20 +286,20 @@
         plugin = bzrlib.plugin.plugins()['plugin']
         self.assertEqual('foo', plugin.test_suite())
 
-    def test_no_load_tests_gives_None_for_load_tests(self):
+    def test_no_load_plugin_tests_gives_None_for_load_plugin_tests(self):
         self.setup_plugin()
         loader = TestUtil.TestLoader()
         plugin = bzrlib.plugin.plugins()['plugin']
-        self.assertEqual(None, plugin.load_tests(loader))
+        self.assertEqual(None, plugin.load_plugin_tests(loader))
 
-    def test_load_tests_gives_load_tests_result(self):
+    def test_load_plugin_tests_gives_load_plugin_tests_result(self):
         source = """
 def load_tests(standard_tests, module, loader):
     return 'foo'"""
         self.setup_plugin(source)
         loader = TestUtil.TestLoader()
         plugin = bzrlib.plugin.plugins()['plugin']
-        self.assertEqual('foo', plugin.load_tests(loader))
+        self.assertEqual('foo', plugin.load_plugin_tests(loader))
 
     def test_no_version_info(self):
         self.setup_plugin()