~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_help.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
105
105
        self.assertEquals(dash_help, qmark_cmds)
106
106
 
107
107
    def test_hidden(self):
108
 
        commands = self.run_bzr('help commands')[0]
109
 
        hidden = self.run_bzr('help hidden-commands')[0]
 
108
        help_commands = self.run_bzr('help commands')[0]
 
109
        help_hidden = self.run_bzr('help hidden-commands')[0]
 
110
 
 
111
        def extract_cmd_names(help_output):
 
112
            # keep only the command names to avoid matching on help text (there
 
113
            # is a high risk to fail a test when a plugin get installed
 
114
            # otherwise)
 
115
            cmds = []
 
116
            for line in help_output.split('\n'):
 
117
                if line.startswith(' '):
 
118
                    continue # help on more than one line
 
119
                cmd = line.split(' ')[0]
 
120
                if line:
 
121
                    cmds.append(cmd)
 
122
            return cmds
 
123
        commands = extract_cmd_names(help_commands)
 
124
        hidden = extract_cmd_names(help_hidden)
110
125
        self.assertTrue('commit' in commands)
111
126
        self.assertTrue('commit' not in hidden)
112
127
        self.assertTrue('rocks' in hidden)