/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/blackbox/test_help.py

  • Committer: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_help.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr help.
58
58
        out, err = self.run_bzr('help checkouts')
59
59
        self.assertContainsRe(out, 'checkout')
60
60
        self.assertContainsRe(out, 'lightweight')
61
 
 
 
61
        
62
62
    def test_help_urlspec(self):
63
63
        """Smoke test for 'bzr help urlspec'"""
64
64
        out, err = self.run_bzr('help urlspec')
105
105
        self.assertEquals(dash_help, qmark_cmds)
106
106
 
107
107
    def test_hidden(self):
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)
 
108
        commands = self.run_bzr('help commands')[0]
 
109
        hidden = self.run_bzr('help hidden-commands')[0]
125
110
        self.assertTrue('commit' in commands)
126
111
        self.assertTrue('commit' not in hidden)
127
112
        self.assertTrue('rocks' in hidden)
128
113
        self.assertTrue('rocks' not in commands)
129
114
 
130
115
    def test_help_detail(self):
131
 
        dash_h  = self.run_bzr('diff -h')[0]
132
 
        help_x  = self.run_bzr('help diff')[0]
 
116
        dash_h  = self.run_bzr('commit -h')[0]
 
117
        help_x  = self.run_bzr('help commit')[0]
 
118
        qmark_x = self.run_bzr('help commit')[0]
133
119
        self.assertEquals(dash_h, help_x)
134
 
        self.assertContainsRe(help_x, "Purpose:")
135
 
        self.assertContainsRe(help_x, "Usage:")
136
 
        self.assertContainsRe(help_x, "Options:")
137
 
        self.assertContainsRe(help_x, "Description:")
138
 
        self.assertContainsRe(help_x, "Examples:")
139
 
        self.assertContainsRe(help_x, "See also:")
140
 
        self.assertContainsRe(help_x, "Aliases:")
141
 
 
142
 
    def test_help_usage(self):
143
 
        usage  = self.run_bzr('diff --usage')[0]
144
 
        self.assertContainsRe(usage, "Purpose:")
145
 
        self.assertContainsRe(usage, "Usage:")
146
 
        self.assertContainsRe(usage, "Options:")
147
 
        self.assertNotContainsRe(usage, "Description:")
148
 
        self.assertNotContainsRe(usage, "Examples:")
149
 
        self.assertContainsRe(usage, "See also:")
150
 
        self.assertContainsRe(usage, "Aliases:")
 
120
        self.assertEquals(dash_h, qmark_x)
151
121
 
152
122
    def test_help_help(self):
153
123
        help = self.run_bzr('help help')[0]