← 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-08-12 16:12:23 UTC
  • mfrom: (6060.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110812161223-hfvwsgbtb9vype5r
(vila) Merge 2.4 into trunk (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
254
254
        t = self.get_transport()
255
255
        url = t.base
256
256
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
257
 
        backup_dir = 'backup.bzr.%7E1%7E'
 
257
        backup_dir = 'backup.bzr.~1~'
258
258
        self.assertEqualDiff("""Upgrading branch %s ...
259
259
starting upgrade of %s
260
260
making backup of %s.bzr
262
262
starting repository conversion
263
263
repository converted
264
264
finished
265
 
""" % (url, url, url, url, backup_dir), out)
 
265
""" % (url, url, url, url,backup_dir), out)
266
266
        self.assertEqual('', err)
267
267
 
268
268