← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-26 08:08:23 UTC
  • mfrom: (5514.1.1 665100-content-type)
  • mto: This revision was merged to the branch mainline in revision 5516.
  • Revision ID: v.ladeuil+lp@free.fr-20101026080823-3wggo03b7cpn9908
Correctly set the Content-Type header when POSTing http requests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for upgrade of old trees.
18
18
 
19
 
This file contains canned versions of some old trees, which are instantiated 
 
19
This file contains canned versions of some old trees, which are instantiated
20
20
and then upgraded to the new format."""
21
21
 
22
22
# TODO queue for upgrade:
26
26
import os
27
27
import sys
28
28
 
 
29
from bzrlib import (
 
30
    branch as _mod_branch,
 
31
    bzrdir,
 
32
    progress,
 
33
    repository,
 
34
    transport,
 
35
    workingtree,
 
36
    workingtree_4,
 
37
    )
29
38
import bzrlib.branch
30
39
from bzrlib.branch import Branch
31
 
import bzrlib.bzrdir as bzrdir
32
 
import bzrlib.repository as repository
33
 
from bzrlib.revision import is_ancestor
34
 
from bzrlib.tests import TestCase, TestCaseInTempDir
35
 
from bzrlib.transport import get_transport
 
40
from bzrlib.tests import TestCaseWithTransport
36
41
from bzrlib.upgrade import upgrade
37
 
import bzrlib.workingtree as workingtree
38
 
 
39
 
 
40
 
class TestUpgrade(TestCaseInTempDir):
41
 
    
42
 
    def test_build_tree(self):
43
 
        """Test tree-building test helper"""
44
 
        self.build_tree_contents(_upgrade1_template)
45
 
        self.failUnlessExists('foo')
46
 
        self.failUnlessExists('.bzr/README')
 
42
 
 
43
 
 
44
class TestUpgrade(TestCaseWithTransport):
47
45
 
48
46
    def test_upgrade_simple(self):
49
 
        """Upgrade simple v0.0.4 format to v6"""
 
47
        """Upgrade simple v0.0.4 format to latest format"""
50
48
        eq = self.assertEquals
51
49
        self.build_tree_contents(_upgrade1_template)
52
50
        upgrade(u'.')
63
61
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
64
62
        rt = b.repository.revision_tree(rh[0])
65
63
        foo_id = 'foo-20051004035605-91e788d1875603ae'
66
 
        eq(rt.get_file_text(foo_id), 'initial contents\n')
 
64
        rt.lock_read()
 
65
        try:
 
66
            eq(rt.get_file_text(foo_id), 'initial contents\n')
 
67
        finally:
 
68
            rt.unlock()
67
69
        rt = b.repository.revision_tree(rh[1])
68
 
        eq(rt.get_file_text(foo_id), 'new contents\n')
 
70
        rt.lock_read()
 
71
        try:
 
72
            eq(rt.get_file_text(foo_id), 'new contents\n')
 
73
        finally:
 
74
            rt.unlock()
69
75
        # check a backup was made:
70
 
        transport = get_transport(b.base)
71
 
        transport.stat('.bzr.backup')
72
 
        transport.stat('.bzr.backup/README')
73
 
        transport.stat('.bzr.backup/branch-format')
74
 
        transport.stat('.bzr.backup/revision-history')
75
 
        transport.stat('.bzr.backup/merged-patches')
76
 
        transport.stat('.bzr.backup/pending-merged-patches')
77
 
        transport.stat('.bzr.backup/pending-merges')
78
 
        transport.stat('.bzr.backup/branch-name')
79
 
        transport.stat('.bzr.backup/branch-lock')
80
 
        transport.stat('.bzr.backup/inventory')
81
 
        transport.stat('.bzr.backup/stat-cache')
82
 
        transport.stat('.bzr.backup/text-store')
83
 
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
84
 
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
85
 
        transport.stat('.bzr.backup/inventory-store/')
86
 
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
87
 
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
88
 
        transport.stat('.bzr.backup/revision-store/')
89
 
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
90
 
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
76
        backup_dir = 'backup.bzr.~1~'
 
77
        t = transport.get_transport(b.base)
 
78
        t.stat(backup_dir)
 
79
        t.stat(backup_dir + '/README')
 
80
        t.stat(backup_dir + '/branch-format')
 
81
        t.stat(backup_dir + '/revision-history')
 
82
        t.stat(backup_dir + '/merged-patches')
 
83
        t.stat(backup_dir + '/pending-merged-patches')
 
84
        t.stat(backup_dir + '/pending-merges')
 
85
        t.stat(backup_dir + '/branch-name')
 
86
        t.stat(backup_dir + '/branch-lock')
 
87
        t.stat(backup_dir + '/inventory')
 
88
        t.stat(backup_dir + '/stat-cache')
 
89
        t.stat(backup_dir + '/text-store')
 
90
        t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
91
        t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
 
92
        t.stat(backup_dir + '/inventory-store/')
 
93
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
94
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
95
        t.stat(backup_dir + '/revision-store/')
 
96
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
97
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
91
98
 
92
99
    def test_upgrade_with_ghosts(self):
93
100
        """Upgrade v0.0.4 tree containing ghost references.
94
101
 
95
102
        That is, some of the parents of revisions mentioned in the branch
96
 
        aren't present in the branch's storage. 
 
103
        aren't present in the branch's storage.
97
104
 
98
 
        This shouldn't normally happen in branches created entirely in 
 
105
        This shouldn't normally happen in branches created entirely in
99
106
        bzr, but can happen in branches imported from baz and arch, or from
100
 
        other systems, where the importer knows about a revision but not 
 
107
        other systems, where the importer knows about a revision but not
101
108
        its contents."""
102
109
        eq = self.assertEquals
103
110
        self.build_tree_contents(_ghost_template)
113
120
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
114
121
        old_repo_format = old_repodir.open_repository()._format
115
122
        upgrade('.')
116
 
        # this is the path to the literal file. As format changes 
 
123
        # this is the path to the literal file. As format changes
117
124
        # occur it needs to be updated. FIXME: ask the store for the
118
125
        # path.
119
126
        repo = bzrlib.repository.Repository.open('.')
120
127
        # it should have changed the format
121
128
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
122
 
        # and we should be able to read the names for the file id 
 
129
        # and we should be able to read the names for the file id
123
130
        # 'dir-20051005095101-da1441ea3fa6917a'
124
 
        self.assertNotEqual(
125
 
            [],
126
 
            repo.text_store.get_weave(
127
 
                'dir-20051005095101-da1441ea3fa6917a',
128
 
                repo.get_transaction()))
 
131
        repo.lock_read()
 
132
        self.addCleanup(repo.unlock)
 
133
        text_keys = repo.texts.keys()
 
134
        dir_keys = [key for key in text_keys if key[0] ==
 
135
                'dir-20051005095101-da1441ea3fa6917a']
 
136
        self.assertNotEqual([], dir_keys)
129
137
 
130
138
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
131
139
        self.build_tree_contents(_upgrade_dir_template)
132
140
        upgrade('.', bzrdir.BzrDirMetaFormat1())
133
141
        tree = workingtree.WorkingTree.open('.')
134
 
        self.assertEqual(tree.last_revision(),
135
 
                         tree.branch.revision_history()[-1])
 
142
        self.assertEqual([tree.branch.revision_history()[-1]],
 
143
            tree.get_parent_ids())
 
144
 
 
145
    def test_upgrade_v6_to_meta_no_workingtree(self):
 
146
        # Some format6 branches do not have checkout files. Upgrading
 
147
        # such a branch to metadir must not setup a working tree.
 
148
        self.build_tree_contents(_upgrade1_template)
 
149
        upgrade('.', bzrdir.BzrDirFormat6())
 
150
        t = transport.get_transport('.')
 
151
        t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
 
152
        self.assertFalse(t.has('.bzr/stat-cache'))
 
153
        # XXX: upgrade fails if a backup.bzr is already present
 
154
        # -- David Allouche 2006-08-11
 
155
        t.delete_tree('backup.bzr.~1~')
 
156
        # At this point, we have a format6 branch without checkout files.
 
157
        upgrade('.', bzrdir.BzrDirMetaFormat1())
 
158
        # The upgrade should not have set up a working tree.
 
159
        control = bzrdir.BzrDir.open('.')
 
160
        self.assertFalse(control.has_workingtree())
 
161
        # We have covered the scope of this test, we may as well check that
 
162
        # upgrade has not eaten our data, even if it's a bit redundant with
 
163
        # other tests.
 
164
        self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
 
165
        branch = control.open_branch()
 
166
        self.assertEquals(branch.revision_history(),
 
167
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
 
168
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
 
169
 
 
170
    def test_upgrade_rich_root(self):
 
171
        tree = self.make_branch_and_tree('tree', format='rich-root')
 
172
        rev_id = tree.commit('first post')
 
173
        upgrade('tree')
 
174
 
 
175
    def test_convert_branch5_branch6(self):
 
176
        branch = self.make_branch('branch', format='knit')
 
177
        branch.set_revision_history(['AB', 'CD'])
 
178
        branch.set_parent('file:///EF')
 
179
        branch.set_bound_location('file:///GH')
 
180
        branch.set_push_location('file:///IJ')
 
181
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
182
        converter = branch.bzrdir._format.get_converter(target)
 
183
        converter.convert(branch.bzrdir, None)
 
184
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
 
185
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
 
186
        self.assertEqual('CD', new_branch.last_revision())
 
187
        self.assertEqual('file:///EF', new_branch.get_parent())
 
188
        self.assertEqual('file:///GH', new_branch.get_bound_location())
 
189
        branch_config = new_branch.get_config()._get_branch_data_config()
 
190
        self.assertEqual('file:///IJ',
 
191
            branch_config.get_user_option('push_location'))
 
192
 
 
193
        branch2 = self.make_branch('branch2', format='knit')
 
194
        converter = branch2.bzrdir._format.get_converter(target)
 
195
        converter.convert(branch2.bzrdir, None)
 
196
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
 
197
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
 
198
 
 
199
    def test_convert_branch7_branch8(self):
 
200
        branch = self.make_branch('branch', format='1.9')
 
201
        target = bzrdir.format_registry.make_bzrdir('1.9')
 
202
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
 
203
        converter = branch.bzrdir._format.get_converter(target)
 
204
        converter.convert(branch.bzrdir, None)
 
205
        branch = _mod_branch.Branch.open(self.get_url('branch'))
 
206
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
 
207
        self.assertEqual({}, branch._get_all_reference_info())
 
208
 
 
209
    def test_convert_knit_dirstate_empty(self):
 
210
        # test that asking for an upgrade from knit to dirstate works.
 
211
        tree = self.make_branch_and_tree('tree', format='knit')
 
212
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
213
        converter = tree.bzrdir._format.get_converter(target)
 
214
        converter.convert(tree.bzrdir, None)
 
215
        new_tree = workingtree.WorkingTree.open('tree')
 
216
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
217
        self.assertEqual('null:', new_tree.last_revision())
 
218
 
 
219
    def test_convert_knit_dirstate_content(self):
 
220
        # smoke test for dirstate conversion: we call dirstate primitives,
 
221
        # and its there that the core logic is tested.
 
222
        tree = self.make_branch_and_tree('tree', format='knit')
 
223
        self.build_tree(['tree/file'])
 
224
        tree.add(['file'], ['file-id'])
 
225
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
226
        converter = tree.bzrdir._format.get_converter(target)
 
227
        converter.convert(tree.bzrdir, None)
 
228
        new_tree = workingtree.WorkingTree.open('tree')
 
229
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
230
        self.assertEqual('null:', new_tree.last_revision())
 
231
 
 
232
    def test_convert_knit_one_parent_dirstate(self):
 
233
        # test that asking for an upgrade from knit to dirstate works.
 
234
        tree = self.make_branch_and_tree('tree', format='knit')
 
235
        rev_id = tree.commit('first post')
 
236
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
237
        converter = tree.bzrdir._format.get_converter(target)
 
238
        converter.convert(tree.bzrdir, None)
 
239
        new_tree = workingtree.WorkingTree.open('tree')
 
240
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
241
        self.assertEqual(rev_id, new_tree.last_revision())
 
242
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
 
243
            'pending-merges', 'stat-cache']:
 
244
            self.failIfExists('tree/.bzr/checkout/' + path)
 
245
 
 
246
    def test_convert_knit_merges_dirstate(self):
 
247
        tree = self.make_branch_and_tree('tree', format='knit')
 
248
        rev_id = tree.commit('first post')
 
249
        merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
 
250
        rev_id2 = tree.commit('second post')
 
251
        rev_id3 = merge_tree.commit('second merge post')
 
252
        tree.merge_from_branch(merge_tree.branch)
 
253
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
254
        converter = tree.bzrdir._format.get_converter(target)
 
255
        converter.convert(tree.bzrdir, None)
 
256
        new_tree = workingtree.WorkingTree.open('tree')
 
257
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
258
        self.assertEqual(rev_id2, new_tree.last_revision())
 
259
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
 
260
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
 
261
            'pending-merges', 'stat-cache']:
 
262
            self.failIfExists('tree/.bzr/checkout/' + path)
136
263
 
137
264
 
138
265
_upgrade1_template = \
140
267
     ('foo', 'new contents\n'),
141
268
     ('.bzr/',),
142
269
     ('.bzr/README',
143
 
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
 
270
      'This is a Bazaar control directory.\n'
 
271
      'Do not change any files in this directory.\n'
 
272
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
144
273
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
145
274
     ('.bzr/revision-history',
146
275
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
180
309
    ),
181
310
    ( './.bzr/', ),
182
311
    ( './.bzr/README',
183
 
        'This is a Bazaar-NG control directory.\n'
184
 
        'Do not change any files in this directory.\n'
 
312
      'This is a Bazaar control directory.\n'
 
313
      'Do not change any files in this directory.\n'
 
314
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
185
315
    ),
186
316
    ( './.bzr/branch-format',
187
317
        'Bazaar-NG branch, format 0.0.4\n'
245
375
_upgrade_dir_template = [
246
376
    ( './.bzr/', ),
247
377
    ( './.bzr/README',
248
 
        'This is a Bazaar-NG control directory.\n'
249
 
        'Do not change any files in this directory.\n'
 
378
      'This is a Bazaar control directory.\n'
 
379
      'Do not change any files in this directory.\n'
 
380
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
250
381
    ),
251
382
    ( './.bzr/branch-format',
252
383
        'Bazaar-NG branch, format 0.0.4\n'