~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_plugins.py

  • Committer: Marius Kruger
  • Date: 2007-06-27 18:48:10 UTC
  • mfrom: (2557 +trunk)
  • mto: (2605.1.1 rm-renamed)
  • mto: This revision was merged to the branch mainline in revision 2609.
  • Revision ID: marius.kruger@enerweb.co.za-20070627184810-4jq1y5f20xafow9w
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
148
148
    def split_help_commands(self):
149
149
        help = {}
150
150
        current = None
151
 
        for line in self.capture('help commands').splitlines():
 
151
        for line in self.run_bzr('help commands')[0].splitlines():
152
152
            if not line.startswith(' '):
153
153
                current = line.split()[0]
154
154
            help[current] = help.get(current, '') + line
185
185
            # Check its help
186
186
            bzrlib.plugin.load_from_path(['plugin_test'])
187
187
            bzrlib.commands.register_command( bzrlib.plugins.myplug.cmd_myplug)
188
 
            help = self.capture('help myplug')
 
188
            help = self.run_bzr('help myplug')[0]
189
189
            self.assertContainsRe(help, 'From plugin "myplug"')
190
190
            help = self.split_help_commands()['myplug']
191
191
            self.assertContainsRe(help, '\[myplug\]')