← 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: Andrew Bennetts
  • Date: 2010-07-28 07:05:19 UTC
  • mfrom: (5050.3.15 2.2)
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100728070519-kkflohg6djas3ui4
Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
21
21
from bzrlib import (
22
22
    bzrdir,
23
23
    repository,
 
24
    transport,
24
25
    )
25
26
from bzrlib.tests import (
26
27
    features,
28
29
    TestCaseWithTransport,
29
30
    )
30
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
31
 
from bzrlib.transport import get_transport
32
32
from bzrlib.repofmt.knitrepo import (
33
33
    RepositoryFormatKnit1,
34
34
    )
79
79
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
80
80
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
81
81
                         "upgraded separately.\n"
82
 
                         % get_transport(self.get_url('current_format_branch')).base,
 
82
                         % transport.get_transport(
 
83
                self.get_url('current_format_branch')).base,
83
84
                         out)
84
85
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
85
86
                             "directory format 1 is already at the most "
101
102
    def test_upgrade_explicit_metaformat(self):
102
103
        # users can force an upgrade to metadir format.
103
104
        self.make_format_5_branch()
104
 
        url = get_transport(self.get_url('format_5_branch')).base
 
105
        url = transport.get_transport(self.get_url('format_5_branch')).base
105
106
        # check --format takes effect
106
107
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
107
108
        backup_dir = 'backup.bzr.~1~'
125
126
        # users can force an upgrade to knit format from a metadir weave
126
127
        # branch
127
128
        self.make_metadir_weave_branch()
128
 
        url = get_transport(self.get_url('metadir_weave_branch')).base
 
129
        url = transport.get_transport(self.get_url('metadir_weave_branch')).base
129
130
        # check --format takes effect
130
131
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
131
132
        backup_dir = 'backup.bzr.~1~'
163
164
 
164
165
    def test_upgrade_with_existing_backup_dir(self):
165
166
        self.make_format_5_branch()
166
 
        transport = get_transport(self.get_url('format_5_branch'))
167
 
        url = transport.base
 
167
        t = transport.get_transport(self.get_url('format_5_branch'))
 
168
        url = t.base
168
169
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
169
170
        backup_dir1 = 'backup.bzr.~1~'
170
171
        backup_dir2 = 'backup.bzr.~2~'
171
172
        # explicitly create backup_dir1. bzr should create the .~2~ directory
172
173
        # as backup
173
 
        transport.mkdir(backup_dir1)
 
174
        t.mkdir(backup_dir1)
174
175
        (out, err) = self.run_bzr(
175
176
            ['upgrade', '--format=metaweave', url])
176
177
        self.assertEqualDiff("""starting upgrade of %s
186
187
        self.assertTrue(isinstance(
187
188
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
188
189
            bzrdir.BzrDirMetaFormat1))
189
 
        self.assertTrue(transport.has(backup_dir2))
 
190
        self.assertTrue(t.has(backup_dir2))
190
191
 
191
192
class SFTPTests(TestCaseWithSFTPServer):
192
193
    """Tests for upgrade over sftp."""
193
194
 
194
195
    def test_upgrade_url(self):
195
196
        self.run_bzr('init --format=weave')
196
 
        t = get_transport(self.get_url())
 
197
        t = transport.get_transport(self.get_url())
197
198
        url = t.base
198
199
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
199
200
        backup_dir = 'backup.bzr.~1~'