/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2008-04-02 13:45:13 UTC
  • mto: (3334.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3335.
  • Revision ID: v.ladeuil+lp@free.fr-20080402134513-xfj7652jfsxg6hwh
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2854
2854
        # but really if you don't have --no-plugins this should be a failure.
2855
2855
        # mbp 20080213 - see http://bugs.launchpad.net/bugs/189771
2856
2856
        if plugin_suite is None:
2857
 
            plugin_suite = plugin.load_tests(loader)
 
2857
            plugin_suite = plugin.load_plugin_tests(loader)
2858
2858
        if plugin_suite is not None:
2859
2859
            suite.addTest(plugin_suite)
2860
2860
        if default_encoding != sys.getdefaultencoding():