← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
21
21
import sys
22
22
 
23
23
import bzrlib
 
24
from bzrlib import repository
24
25
from bzrlib.osutils import format_date
25
26
from bzrlib.tests import TestSkipped
26
27
from bzrlib.tests.blackbox import ExternalBase
133
134
        # Branch and bind to standalone, needs upgrade to metadir
134
135
        # (creates backup as unknown)
135
136
        branch1.bzrdir.sprout('bound')
136
 
        bzrlib.upgrade.upgrade('bound', bzrlib.bzrdir.BzrDirMetaFormat1())
 
137
        knit1_format = bzrlib.bzrdir.BzrDirMetaFormat1()
 
138
        knit1_format.repository_format = repository.RepositoryFormatKnit1()
 
139
        bzrlib.upgrade.upgrade('bound', knit1_format)
137
140
        branch3 = bzrlib.bzrdir.BzrDir.open('bound').open_branch()
138
141
        branch3.bind(branch1)
139
142
        bound_tree = branch3.bzrdir.open_workingtree()
186
189
 
187
190
        # Checkout standalone (same as above, but does not have parent set)
188
191
        old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
189
 
        bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrlib.bzrdir.BzrDirMetaFormat1())
 
192
        bzrlib.bzrdir.BzrDirFormat.set_default_format(knit1_format)
190
193
        branch4 = bzrlib.bzrdir.BzrDir.create_branch_convenience('checkout')
191
194
        bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
192
195
        branch4.bind(branch1)