← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-12-21 04:13:14 UTC
  • mfrom: (2197.2.2 diff-refactoring)
  • Revision ID: pqm@pqm.ubuntu.com-20061221041314-2991e63a023efcf1
(mbp) initial cleanups of cmd_diff (r=john)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
35
35
    def setUp(self):
36
36
        super(TestWithUpgradableBranches, self).setUp()
37
37
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
38
        self.old_repo_format = \
 
39
            bzrlib.repository.RepositoryFormat.get_default_format()
38
40
        self.old_ui_factory = ui.ui_factory
39
41
        self.addCleanup(self.restoreDefaults)
40
42
 
41
43
        ui.ui_factory = TestUIFactory()
 
44
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
 
45
        bzrlib.repository.RepositoryFormat.set_default_format(
 
46
            bzrlib.repository.RepositoryFormat7())
 
47
        # FIXME RBC 20060120 we should be able to do this via ui calls only.
42
48
        # setup a format 5 branch we can upgrade from.
43
 
        self.make_branch_and_tree('format_5_branch',
44
 
                                  format=bzrdir.BzrDirFormat5())
45
 
 
46
 
        current_tree = self.make_branch_and_tree('current_format_branch',
47
 
                                                 format='default')
48
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
49
 
        current_tree.branch.create_checkout(
50
 
            self.get_url('current_format_checkout'), lightweight=True)
 
49
        t = get_transport(self.get_url())
 
50
        t.mkdir('format_5_branch')
 
51
        bzrdir.BzrDirFormat5().initialize(self.get_url('format_5_branch'))
 
52
        bzrdir.BzrDir.create_standalone_workingtree('current_format_branch')
 
53
        d = bzrdir.BzrDir.create('metadir_weave_branch')
 
54
        d.create_repository()
 
55
        d.create_branch()
 
56
        d.create_workingtree()
 
57
        self.run_bzr('checkout',
 
58
                     '--lightweight',
 
59
                     self.get_url('current_format_branch'),
 
60
                     'current_format_checkout')
51
61
 
52
62
    def restoreDefaults(self):
 
63
        bzrdir.BzrDirFormat.set_default_format(self.old_format)
 
64
        bzrlib.repository.RepositoryFormat.set_default_format(
 
65
            self.old_repo_format)
53
66
        ui.ui_factory = self.old_ui_factory
54
 
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
55
67
 
56
68
    def test_readonly_url_error(self):
57
69
        (out, err) = self.run_bzr_captured(
99
111
        # users can force an upgrade to metadir format.
100
112
        url = get_transport(self.get_url('format_5_branch')).base
101
113
        # check --format takes effect
102
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
114
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
103
115
        (out, err) = self.run_bzr_captured(
104
116
            ['upgrade', '--format=metaweave', url])
105
117
        self.assertEqualDiff("""starting upgrade of %s
123
135
        # branch
124
136
        url = get_transport(self.get_url('metadir_weave_branch')).base
125
137
        # check --format takes effect
126
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
138
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
127
139
        (out, err) = self.run_bzr_captured(
128
140
            ['upgrade', '--format=knit', url])
129
141
        self.assertEqualDiff("""starting upgrade of %s