~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_upgrade.py

Merge integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib.branch import Branch, BzrBranchFormat5
 
23
import bzrlib.bzrdir as bzrdir
24
24
from bzrlib.tests import TestCaseWithTransport
25
25
from bzrlib.transport import get_transport
26
26
 
33
33
        # setup a format 5 branch we can upgrade from.
34
34
        t = get_transport(self.get_url())
35
35
        t.mkdir('old_branch')
36
 
        BzrBranchFormat5().initialize(self.get_url('old_branch'))
 
36
        bzrdir.BzrDirFormat5().initialize(self.get_url('old_branch'))
37
37
 
38
38
    def test_readonly_url_error(self):
39
39
        (out, err) = self.run_bzr_captured(