/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 breezy/tests/test_sftp_transport.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_sftp_transport.py
195
195
        t = controldir.ControlDir.create_standalone_workingtree('a')
196
196
        b = t.branch
197
197
        t.add('foo')
198
 
        t.commit('foo', rev_id='a1')
 
198
        t.commit('foo', rev_id=b'a1')
199
199
 
200
200
        b2 = controldir.ControlDir.create_branch_and_repo(self.get_url('/b'))
201
201
        b2.pull(b)
203
203
        self.assertEqual(b2.last_revision(), 'a1')
204
204
 
205
205
        with open('a/foo', 'wt') as f: f.write('something new in foo\n')
206
 
        t.commit('new', rev_id='a2')
 
206
        t.commit('new', rev_id=b'a2')
207
207
        b2.pull(b)
208
208
 
209
209
        self.assertEqual(b2.last_revision(), 'a2')
296
296
 
297
297
    def test_bad_connection_ssh(self):
298
298
        """None => auto-detect vendor"""
299
 
        f = file(os.devnull, "wb")
 
299
        f = open(os.devnull, "wb")
300
300
        self.addCleanup(f.close)
301
301
        self.set_vendor(None, f)
302
302
        t = _mod_transport.get_transport_from_url(self.bogus_url)