/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/test_plugins.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_plugins.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
 
18
17
"""Tests for plugins"""
19
18
 
20
19
# XXX: There are no plugin tests at the moment because the plugin module
22
21
# comments.
23
22
 
24
23
import os
 
24
from StringIO import StringIO
25
25
 
26
26
import bzrlib.plugin
27
27
import bzrlib.plugins
 
28
import bzrlib.commands
 
29
import bzrlib.help
28
30
from bzrlib.tests import TestCaseInTempDir
29
31
from bzrlib.osutils import pathjoin, abspath
30
32
 
137
139
            if getattr(bzrlib.plugins, 'plugin', None):
138
140
                del bzrlib.plugins.plugin
139
141
        self.failIf(getattr(bzrlib.plugins, 'plugin', None))
 
142
 
 
143
 
 
144
class TestPluginHelp(TestCaseInTempDir):
 
145
 
 
146
    def split_help_commands(self):
 
147
        help = {}
 
148
        current = None
 
149
        for line in self.capture('help commands').splitlines():
 
150
            if not line.startswith(' '):
 
151
                current = line.split()[0]
 
152
            help[current] = help.get(current, '') + line
 
153
 
 
154
        return help
 
155
 
 
156
    def test_plugin_help_builtins_unaffected(self):
 
157
        # Check we don't get false positives
 
158
        help_commands = self.split_help_commands()
 
159
        for cmd_name in bzrlib.commands.builtin_command_names():
 
160
            if cmd_name in bzrlib.commands.plugin_command_names():
 
161
                continue
 
162
            help = StringIO()
 
163
            try:
 
164
                bzrlib.help.help_on_command(cmd_name, help)
 
165
            except NotImplementedError:
 
166
                # some commands have no help
 
167
                pass
 
168
            else:
 
169
                help.seek(0)
 
170
                self.assertNotContainsRe(help.read(), 'From plugin "[^"]*"')
 
171
 
 
172
            if help in help_commands.keys():
 
173
                # some commands are hidden
 
174
                help = help_commands[cmd_name]
 
175
                self.assertNotContainsRe(help, 'From plugin "[^"]*"')
 
176
 
 
177
    def test_plugin_help_shows_plugin(self):
 
178
        # Create a test plugin
 
179
        os.mkdir('plugin_test')
 
180
        f = open(pathjoin('plugin_test', 'myplug.py'), 'w')
 
181
        f.write(PLUGIN_TEXT)
 
182
        f.close()
 
183
 
 
184
        try:
 
185
            # Check its help
 
186
            bzrlib.plugin.load_from_dirs(['plugin_test'])
 
187
            bzrlib.commands.register_command( bzrlib.plugins.myplug.cmd_myplug)
 
188
            help = self.capture('help myplug')
 
189
            self.assertContainsRe(help, 'From plugin "myplug"')
 
190
            help = self.split_help_commands()['myplug']
 
191
            self.assertContainsRe(help, '\[myplug\]')
 
192
        finally:
 
193
            # remove the plugin 'plugin'
 
194
            if getattr(bzrlib.plugins, 'plugin', None):
 
195
                del bzrlib.plugins.plugin