← 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: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
21
21
import time
22
22
 
23
23
from bzrlib import (
24
 
    bzrdir,
25
24
    config,
 
25
    controldir,
26
26
    errors,
27
27
    tests,
28
28
    transport as _mod_transport,
191
191
 
192
192
    def test_push_support(self):
193
193
        self.build_tree(['a/', 'a/foo'])
194
 
        t = bzrdir.BzrDir.create_standalone_workingtree('a')
 
194
        t = controldir.ControlDir.create_standalone_workingtree('a')
195
195
        b = t.branch
196
196
        t.add('foo')
197
197
        t.commit('foo', rev_id='a1')
198
198
 
199
 
        b2 = bzrdir.BzrDir.create_branch_and_repo(self.get_url('/b'))
 
199
        b2 = controldir.ControlDir.create_branch_and_repo(self.get_url('/b'))
200
200
        b2.pull(b)
201
201
 
202
202
        self.assertEquals(b2.last_revision(), 'a1')