← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_help.py
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)