/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 bzrlib/tests/blackbox/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-10 17:27:04 UTC
  • mto: (5712.4.8 bzrdir-weave)
  • mto: This revision was merged to the branch mainline in revision 5716.
  • Revision ID: jelmer@samba.org-20110310172704-y54silj998q0wiji
more fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
129
129
 
130
130
    def test_upgrade_control_dir(self):
131
131
        old_format = OldBzrDirFormat()
132
 
        self.addCleanup(bzrdir.BzrDirFormat.unregister_format, old_format)
133
 
        bzrdir.BzrDirFormat.register_format(old_format)
 
132
        self.addCleanup(bzrdir.BzrProber.formats.remove,
 
133
            old_format.get_format_string())
 
134
        bzrdir.BzrProber.formats.register(old_format.get_format_string(),
 
135
            old_format)
134
136
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
135
137
                        controldir.ControlDirFormat.get_default_format())
136
138