← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade_stacked.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade_stacked.py
18
18
"""Tests for upgrades of various stacking situations."""
19
19
 
20
20
from bzrlib import (
21
 
    bzrdir,
 
21
    controldir,
22
22
    check,
23
23
    errors,
24
24
    tests,
71
71
        self.assertTrue(stacked.open_branch().get_stacked_on_url())
72
72
        # now we'll upgrade the underlying branch, then upgrade the stacked
73
73
        # branch, and this should still work.
74
 
        new_format = bzrdir.format_registry.make_bzrdir(
 
74
        new_format = controldir.format_registry.make_bzrdir(
75
75
            self.scenario_new_format)
76
76
        upgrade('base', new_format)
77
77
        # in some cases you'll get an error if the underlying model has
81
81
                stacked.open_branch)
82
82
        else:
83
83
            check.check_dwim('stacked', False, True, True)
84
 
        stacked = bzrdir.BzrDir.open('stacked')
 
84
        stacked = controldir.ControlDir.open('stacked')
85
85
        # but we can upgrade the stacked repository
86
86
        upgrade('stacked', new_format)
87
87
        # and now it opens ok
88
 
        stacked = bzrdir.BzrDir.open('stacked')
 
88
        stacked = controldir.ControlDir.open('stacked')
89
89
        # And passes check.
90
90
        check.check_dwim('stacked', False, True, True)