← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_index.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_index.py
389
389
        for key, value, references in nodes:
390
390
            builder.add_node(key, value, references)
391
391
        stream = builder.finish()
392
 
        trans = transport.get_transport('trace+' + self.get_url())
 
392
        trans = transport.get_transport_from_url('trace+' + self.get_url())
393
393
        size = trans.put_file('index', stream)
394
394
        return index.GraphIndex(trans, 'index', size)
395
395
 
1056
1056
    def test_supports_unlimited_cache(self):
1057
1057
        builder = index.GraphIndexBuilder(0, key_elements=1)
1058
1058
        stream = builder.finish()
1059
 
        trans = transport.get_transport(self.get_url())
 
1059
        trans = self.get_transport()
1060
1060
        size = trans.put_file('index', stream)
1061
1061
        # It doesn't matter what unlimited_cache does here, just that it can be
1062
1062
        # passed