/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/test_plugins.py

Fix bogus helpers and add a test.

* bzrlib/tests/test_plugins.py:
(TestDisablePlugin.test_regular_load): Ensure we can load the
plugin normally so other tests can verify that the plugin is not
loaded.
(TestPluginMixin.assertPluginUnknown,
TestPluginMixin.assertPluginKnown): Fix typo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_plugins.py
67
67
            delattr(bzrlib.plugins, name)
68
68
 
69
69
    def assertPluginUnknown(self, name):
70
 
        self.failIf(getattr(bzrlib.plugins, 'plugin', None) is not None)
 
70
        self.failIf(getattr(bzrlib.plugins, name, None) is not None)
71
71
        self.failIf('bzrlib.plugins.%s' % name in sys.modules)
72
72
 
73
73
    def assertPluginKnown(self, name):
74
 
        self.failUnless(getattr(bzrlib.plugins, 'plugin', None) is not None)
 
74
        self.failUnless(getattr(bzrlib.plugins, name, None) is not None)
75
75
        self.failUnless('bzrlib.plugins.%s' % name in sys.modules)
76
76
 
77
77
 
762
762
            pass
763
763
        self.assertPluginUnknown('test_foo')
764
764
 
 
765
    def test_regular_load(self):
 
766
        self.overrideAttr(plugin, '_loaded', False)
 
767
        plugin.load_plugins(['.'])
 
768
        self.assertPluginKnown('test_foo')
 
769
 
765
770
    def test_not_loaded(self):
766
771
        self.warnings = []
767
772
        def captured_warning(*args, **kwargs):