← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
49
49
            'branch-format',
50
50
            bzrdir.BzrDirMetaFormat1().get_format_string(),
51
51
            mode=to_convert._get_file_mode())
52
 
        return bzrdir.BzrDir.open(to_convert.user_url)
 
52
        return controldir.ControlDir.open(to_convert.user_url)
53
53
 
54
54
 
55
55
class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
59
59
    def get_converter(self, format=None):
60
60
        return ConvertOldTestToMeta()
61
61
 
62
 
    def get_format_string(self):
 
62
    @classmethod
 
63
    def get_format_string(cls):
63
64
        return "Ancient Test Format"
64
65
 
65
66
    def _open(self, transport):
89
90
    def test_upgrade_up_to_date(self):
90
91
        self.make_current_format_branch_and_checkout()
91
92
        # when up to date we should get a message to that effect
92
 
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
93
 
        err_msg = ('The branch format %s is already at the most recent format.'
94
 
                   % ('Meta directory format 1'))
95
 
        self.assertEqualDiff('conversion error: %s\nbzr: ERROR: %s\n'
96
 
                             % (err_msg, err_msg),
97
 
                             err)
 
93
        burl = self.get_transport('current_format_branch').local_abspath(".")
 
94
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=0)
 
95
        self.assertEqual(
 
96
            'Upgrading branch %s/ ...\n'
 
97
            'The branch format %s is already at the most recent format.\n'
 
98
            % (burl, 'Meta directory format 1'),
 
99
            out)
98
100
 
99
101
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
100
102
        self.make_current_format_branch_and_checkout()
103
105
        # date
104
106
        burl = self.get_transport('current_format_branch').local_abspath(".")
105
107
        curl = self.get_transport('current_format_checkout').local_abspath(".")
106
 
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
 
108
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=0)
107
109
        self.assertEqual(
108
110
            'Upgrading branch %s/ ...\nThis is a checkout.'
109
111
            ' The branch (%s/) needs to be upgraded separately.\n'
110
 
            % (curl, burl),
 
112
            'The branch format %s is already at the most recent format.\n'
 
113
            % (curl, burl, 'Meta directory format 1'),
111
114
            out)
112
 
        msg = 'The branch format %s is already at the most recent format.' % (
113
 
            'Meta directory format 1')
114
 
        self.assertEqualDiff('conversion error: %s\nbzr: ERROR: %s\n'
115
 
                             % (msg, msg),
116
 
                             err)
117
115
 
118
116
    def test_upgrade_checkout(self):
119
117
        # upgrading a checkout should work
157
155
""" % (display_url, display_url, display_url, display_url, backup_dir), out)
158
156
        self.assertEqualDiff("", err)
159
157
        self.assertTrue(isinstance(
160
 
            bzrdir.BzrDir.open(self.get_url(path))._format,
 
158
            controldir.ControlDir.open(self.get_url(path))._format,
161
159
            bzrdir.BzrDirMetaFormat1))
162
160
 
163
161
    def test_upgrade_explicit_knit(self):
181
179
""" % (display_url, display_url, display_url, display_url, backup_dir),
182
180
                             out)
183
181
        self.assertEqualDiff("", err)
184
 
        converted_dir = bzrdir.BzrDir.open(self.get_url('branch'))
 
182
        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
185
183
        self.assertTrue(isinstance(converted_dir._format,
186
184
                                   bzrdir.BzrDirMetaFormat1))
187
185
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
198
196
        self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
199
197
 
200
198
    def assertBranchFormat(self, dir, format):
201
 
        branch = bzrdir.BzrDir.open_tree_or_branch(self.get_url(dir))[1]
 
199
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[1]
202
200
        branch_format = branch._format
203
 
        meta_format = bzrdir.format_registry.make_bzrdir(format)
 
201
        meta_format = controldir.format_registry.make_bzrdir(format)
204
202
        expected_format = meta_format.get_branch_format()
205
203
        self.assertEqual(expected_format, branch_format)
206
204
 
247
245
""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
248
246
        self.assertEqualDiff("", err)
249
247
        self.assertTrue(isinstance(
250
 
            bzrdir.BzrDir.open(self.get_url("old_format_branch"))._format,
 
248
            controldir.ControlDir.open(self.get_url("old_format_branch"))._format,
251
249
            bzrdir.BzrDirMetaFormat1))
252
250
        self.assertTrue(t.has(backup_dir2))
253
251