← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_plugins.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_plugins.py
148
148
        help = {}
149
149
        current = None
150
150
        for line in self.capture('help commands').splitlines():
151
 
            if line.startswith('bzr '):
152
 
                current = line.split()[1]
 
151
            if not line.startswith(' '):
 
152
                current = line.split()[0]
153
153
            help[current] = help.get(current, '') + line
154
154
 
155
155
        return help
189
189
            help = self.capture('help myplug')
190
190
            self.assertContainsRe(help, 'From plugin "myplug"')
191
191
            help = self.split_help_commands()['myplug']
192
 
            self.assertContainsRe(help, 'From plugin "myplug"')
 
192
            self.assertContainsRe(help, '\[myplug\]')
193
193
        finally:
194
194
            # remove the plugin 'plugin'
195
195
            if getattr(bzrlib.plugins, 'plugin', None):