/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 19:47:19 UTC
  • mfrom: (7178 work)
  • mto: This revision was merged to the branch mainline in revision 7179.
  • Revision ID: jelmer@jelmer.uk-20181116194719-m5ut2wfuze5x9s1p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_upgrade.py
132
132
    def test_upgrade_control_dir(self):
133
133
        old_format = OldBzrDirFormat()
134
134
        self.addCleanup(bzr.BzrProber.formats.remove,
135
 
            old_format.get_format_string())
 
135
                        old_format.get_format_string())
136
136
        bzr.BzrProber.formats.register(old_format.get_format_string(),
137
 
            old_format)
 
137
                                       old_format)
138
138
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
139
139
                        controldir.ControlDirFormat.get_default_format())
140
140
 
180
180
repository converted
181
181
finished
182
182
""" % (display_url, display_url, display_url, display_url, backup_dir),
183
 
                             out)
 
183
            out)
184
184
        self.assertEqualDiff("", err)
185
185
        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
186
186
        self.assertTrue(isinstance(converted_dir._format,
199
199
        self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
200
200
 
201
201
    def assertBranchFormat(self, dir, format):
202
 
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[1]
 
202
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[
 
203
            1]
203
204
        branch_format = branch._format
204
205
        meta_format = controldir.format_registry.make_controldir(format)
205
206
        expected_format = meta_format.get_branch_format()
248
249
""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
249
250
        self.assertEqualDiff("", err)
250
251
        self.assertTrue(isinstance(
251
 
            controldir.ControlDir.open(self.get_url("old_format_branch"))._format,
 
252
            controldir.ControlDir.open(
 
253
                self.get_url("old_format_branch"))._format,
252
254
            bzrdir.BzrDirMetaFormat1))
253
255
        self.assertTrue(t.has(backup_dir2))
254
256
 
261
263
        t = self.get_transport()
262
264
        url = t.base
263
265
        display_url = urlutils.unescape_for_display(url,
264
 
            'utf-8')
 
266
                                                    'utf-8')
265
267
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
266
268
        backup_dir = 'backup.bzr.~1~'
267
269
        self.assertEqualDiff("""Upgrading branch %s ...