/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/test_http.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
    trace,
42
42
    transport,
43
43
    ui,
 
44
    urlutils,
44
45
    )
45
46
from ..bzr import (
46
47
    remote as _mod_remote,
381
382
    def test_invalid_http_urls(self):
382
383
        """Trap invalid construction of urls"""
383
384
        self._transport('http://example.com/bzr/bzr.dev/')
384
 
        self.assertRaises(errors.InvalidURL,
 
385
        self.assertRaises(urlutils.InvalidURL,
385
386
                          self._transport,
386
387
                          'http://http://example.com/bzr/bzr.dev/')
387
388
 
1144
1145
    def test_invalid_proxy(self):
1145
1146
        """A proxy env variable without scheme"""
1146
1147
        self.overrideEnv('http_proxy', 'host:1234')
1147
 
        self.assertRaises(errors.InvalidURL, self._proxied_request)
 
1148
        self.assertRaises(urlutils.InvalidURL, self._proxied_request)
1148
1149
 
1149
1150
    def test_evaluate_proxy_bypass_true(self):
1150
1151
        """The host is not proxied"""
1242
1243
 
1243
1244
    def test_http_proxy_without_scheme(self):
1244
1245
        self.overrideEnv('http_proxy', self.server_host_port)
1245
 
        self.assertRaises(errors.InvalidURL, self.assertProxied)
 
1246
        self.assertRaises(urlutils.InvalidURL, self.assertProxied)
1246
1247
 
1247
1248
 
1248
1249
class TestRanges(http_utils.TestCaseWithWebserver):