~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-09-20 13:59:17 UTC
  • mfrom: (1551.8.25 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
Fix deprecated use of pending_merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
# Authors: Robert Collins <robert.collins@canonical.com>
3
3
# -*- coding: utf-8 -*-
4
4
#
28
28
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
29
29
from bzrlib.transport import get_transport
30
30
import bzrlib.ui as ui
31
 
from bzrlib.repofmt.knitrepo import (
32
 
    RepositoryFormatKnit1,
33
 
    RepositoryFormatKnit2,
34
 
    )
35
31
 
36
32
 
37
33
class TestWithUpgradableBranches(TestCaseWithTransport):
39
35
    def setUp(self):
40
36
        super(TestWithUpgradableBranches, self).setUp()
41
37
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
38
        self.old_repo_format = \
 
39
            bzrlib.repository.RepositoryFormat.get_default_format()
42
40
        self.old_ui_factory = ui.ui_factory
43
41
        self.addCleanup(self.restoreDefaults)
44
42
 
45
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.
46
48
        # setup a format 5 branch we can upgrade from.
47
 
        self.make_branch_and_tree('format_5_branch',
48
 
                                  format=bzrdir.BzrDirFormat5())
49
 
 
50
 
        current_tree = self.make_branch_and_tree('current_format_branch',
51
 
                                                 format='default')
52
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
53
 
        current_tree.branch.create_checkout(
54
 
            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')
55
61
 
56
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)
57
66
        ui.ui_factory = self.old_ui_factory
58
 
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
59
67
 
60
68
    def test_readonly_url_error(self):
61
69
        (out, err) = self.run_bzr_captured(
62
70
            ['upgrade', self.get_readonly_url('format_5_branch')], 3)
63
71
        self.assertEqual(out, "")
64
 
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
 
72
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URL's.\n")
65
73
 
66
74
    def test_upgrade_up_to_date(self):
67
75
        # when up to date we should get a message to that effect
103
111
        # users can force an upgrade to metadir format.
104
112
        url = get_transport(self.get_url('format_5_branch')).base
105
113
        # check --format takes effect
106
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
114
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
107
115
        (out, err) = self.run_bzr_captured(
108
116
            ['upgrade', '--format=metaweave', url])
109
117
        self.assertEqualDiff("""starting upgrade of %s
127
135
        # branch
128
136
        url = get_transport(self.get_url('metadir_weave_branch')).base
129
137
        # check --format takes effect
130
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
138
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
131
139
        (out, err) = self.run_bzr_captured(
132
140
            ['upgrade', '--format=knit', url])
133
141
        self.assertEqualDiff("""starting upgrade of %s
144
152
        self.assertTrue(isinstance(converted_dir._format,
145
153
                                   bzrdir.BzrDirMetaFormat1))
146
154
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
147
 
                                   RepositoryFormatKnit1))
 
155
                                   repository.RepositoryFormatKnit1))
148
156
 
149
157
    def test_upgrade_repo(self):
150
158
        self.run_bzr('init-repository', '--format=metaweave', 'repo')