← 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: 2011-03-22 09:57:11 UTC
  • mfrom: (5724.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20110322095711-9bggm9tnxnw9frow
(jameinel) Fix tar exporters to always write to binary streams. (John A
 Meinel)

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