/breezy/trunk

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

« back to all changes in this revision

Viewing changes to breezy/tests/test_transport.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
411
411
        self.start_server(server)
412
412
        t = transport.get_transport_from_url(server.get_url())
413
413
        self.assertRaises(
414
 
            errors.InvalidURLJoin, urlutils.join, t.base, '..')
 
414
            urlutils.InvalidURLJoin, urlutils.join, t.base, '..')
415
415
 
416
416
 
417
417
class TestChrootServer(tests.TestCase):
718
718
class TestTransportFromUrl(tests.TestCaseInTempDir):
719
719
 
720
720
    def test_with_path(self):
721
 
        self.assertRaises(errors.InvalidURL, transport.get_transport_from_url,
 
721
        self.assertRaises(urlutils.InvalidURL, transport.get_transport_from_url,
722
722
            self.test_dir)
723
723
 
724
724
    def test_with_url(self):
862
862
        self.assertEqual(t.base, 'http://ro%62ey@ex%41mple.com:2222/path/')
863
863
 
864
864
    def test_parse_invalid_url(self):
865
 
        self.assertRaises(errors.InvalidURL,
 
865
        self.assertRaises(urlutils.InvalidURL,
866
866
                          transport.ConnectedTransport,
867
867
                          'sftp://lily.org:~janneke/public/bzr/gub')
868
868
 
1129
1129
        self.assertEqual("http://bar", location_to_url("bar:"))
1130
1130
 
1131
1131
    def test_unicode_url(self):
1132
 
        self.assertRaises(errors.InvalidURL, location_to_url,
 
1132
        self.assertRaises(urlutils.InvalidURL, location_to_url,
1133
1133
            "http://fo/\xc3\xaf".decode("utf-8"))
1134
1134
 
1135
1135
    def test_unicode_path(self):