← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
1
 
# Copyright (C) 2005-2012, 2016 Robey Pointer <robey@lag.net>
 
1
# Copyright (C) 2005-2011 Robey Pointer <robey@lag.net>
2
2
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
import time
22
22
 
23
23
from bzrlib import (
 
24
    bzrdir,
24
25
    config,
25
 
    controldir,
26
26
    errors,
27
27
    tests,
28
28
    transport as _mod_transport,
147
147
 
148
148
 
149
149
class SFTPNonServerTest(TestCase):
150
 
 
151
150
    def setUp(self):
152
 
        super(SFTPNonServerTest, self).setUp()
 
151
        TestCase.setUp(self)
153
152
        self.requireFeature(features.paramiko)
154
153
 
155
154
    def test_parse_url_with_home_dir(self):
156
155
        s = _mod_sftp.SFTPTransport(
157
156
            'sftp://ro%62ey:h%40t@example.com:2222/~/relative')
158
 
        self.assertEqual(s._parsed_url.host, 'example.com')
159
 
        self.assertEqual(s._parsed_url.port, 2222)
160
 
        self.assertEqual(s._parsed_url.user, 'robey')
161
 
        self.assertEqual(s._parsed_url.password, 'h@t')
162
 
        self.assertEqual(s._parsed_url.path, '/~/relative/')
 
157
        self.assertEquals(s._parsed_url.host, 'example.com')
 
158
        self.assertEquals(s._parsed_url.port, 2222)
 
159
        self.assertEquals(s._parsed_url.user, 'robey')
 
160
        self.assertEquals(s._parsed_url.password, 'h@t')
 
161
        self.assertEquals(s._parsed_url.path, '/~/relative/')
163
162
 
164
163
    def test_relpath(self):
165
164
        s = _mod_sftp.SFTPTransport('sftp://user@host.com/abs/path')
192
191
 
193
192
    def test_push_support(self):
194
193
        self.build_tree(['a/', 'a/foo'])
195
 
        t = controldir.ControlDir.create_standalone_workingtree('a')
 
194
        t = bzrdir.BzrDir.create_standalone_workingtree('a')
196
195
        b = t.branch
197
196
        t.add('foo')
198
197
        t.commit('foo', rev_id='a1')
199
198
 
200
 
        b2 = controldir.ControlDir.create_branch_and_repo(self.get_url('/b'))
 
199
        b2 = bzrdir.BzrDir.create_branch_and_repo(self.get_url('/b'))
201
200
        b2.pull(b)
202
201
 
203
 
        self.assertEqual(b2.last_revision(), 'a1')
 
202
        self.assertEquals(b2.last_revision(), 'a1')
204
203
 
205
204
        with open('a/foo', 'wt') as f: f.write('something new in foo\n')
206
205
        t.commit('new', rev_id='a2')
207
206
        b2.pull(b)
208
207
 
209
 
        self.assertEqual(b2.last_revision(), 'a2')
 
208
        self.assertEquals(b2.last_revision(), 'a2')
210
209
 
211
210
 
212
211
class SSHVendorConnection(TestCaseWithSFTPServer):
362
361
class TestSocketDelay(TestCase):
363
362
 
364
363
    def setUp(self):
365
 
        super(TestSocketDelay, self).setUp()
 
364
        TestCase.setUp(self)
366
365
        self.requireFeature(features.paramiko)
367
366
 
368
367
    def test_delay(self):
496
495
        t = self.get_transport_for_connection(set_config=False)
497
496
        self.assertIs(None, t._get_credentials()[0])
498
497
        # No prompts should've been printed, stdin shouldn't have been read
499
 
        self.assertEqual("", stdout.getvalue())
500
 
        self.assertEqual(0, ui.ui_factory.stdin.tell())
 
498
        self.assertEquals("", stdout.getvalue())
 
499
        self.assertEquals(0, ui.ui_factory.stdin.tell())