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

  • Committer: John Arbash Meinel
  • Date: 2009-06-17 19:08:25 UTC
  • mto: This revision was merged to the branch mainline in revision 4460.
  • Revision ID: john@arbash-meinel.com-20090617190825-ktfk82li57rf2im6
It seems that fetch() no longer returns the number of revisions fetched.
It still does for *some* InterRepository fetch paths, but the generic one does not.
It is also not easy to get it to, since the Source and Sink are the ones
that would know how many keys were transmitted, and they are potentially 'remote'
objects.

This was also only tested to occur as a by-product in a random 'test_commit' test.
I assume if we really wanted the assurance, we would have a per_repo or interrepo
test for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005 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
79
79
        finally:
80
80
            rt.unlock()
81
81
        # check a backup was made:
82
 
        backup_dir = 'backup.bzr.~1~'
83
82
        transport = get_transport(b.base)
84
 
        transport.stat(backup_dir)
85
 
        transport.stat(backup_dir + '/README')
86
 
        transport.stat(backup_dir + '/branch-format')
87
 
        transport.stat(backup_dir + '/revision-history')
88
 
        transport.stat(backup_dir + '/merged-patches')
89
 
        transport.stat(backup_dir + '/pending-merged-patches')
90
 
        transport.stat(backup_dir + '/pending-merges')
91
 
        transport.stat(backup_dir + '/branch-name')
92
 
        transport.stat(backup_dir + '/branch-lock')
93
 
        transport.stat(backup_dir + '/inventory')
94
 
        transport.stat(backup_dir + '/stat-cache')
95
 
        transport.stat(backup_dir + '/text-store')
96
 
        transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
97
 
        transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
98
 
        transport.stat(backup_dir + '/inventory-store/')
99
 
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
100
 
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
101
 
        transport.stat(backup_dir + '/revision-store/')
102
 
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
103
 
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
83
        transport.stat('backup.bzr')
 
84
        transport.stat('backup.bzr/README')
 
85
        transport.stat('backup.bzr/branch-format')
 
86
        transport.stat('backup.bzr/revision-history')
 
87
        transport.stat('backup.bzr/merged-patches')
 
88
        transport.stat('backup.bzr/pending-merged-patches')
 
89
        transport.stat('backup.bzr/pending-merges')
 
90
        transport.stat('backup.bzr/branch-name')
 
91
        transport.stat('backup.bzr/branch-lock')
 
92
        transport.stat('backup.bzr/inventory')
 
93
        transport.stat('backup.bzr/stat-cache')
 
94
        transport.stat('backup.bzr/text-store')
 
95
        transport.stat('backup.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
96
        transport.stat('backup.bzr/text-store/foo-20051004035756-4081373d897c3453.gz')
 
97
        transport.stat('backup.bzr/inventory-store/')
 
98
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
99
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
100
        transport.stat('backup.bzr/revision-store/')
 
101
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
102
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
104
103
 
105
104
    def test_upgrade_with_ghosts(self):
106
105
        """Upgrade v0.0.4 tree containing ghost references.
158
157
        self.assertFalse(transport.has('.bzr/stat-cache'))
159
158
        # XXX: upgrade fails if a backup.bzr is already present
160
159
        # -- David Allouche 2006-08-11
161
 
        transport.delete_tree('backup.bzr.~1~')
 
160
        transport.delete_tree('backup.bzr')
162
161
        # At this point, we have a format6 branch without checkout files.
163
162
        upgrade('.', bzrdir.BzrDirMetaFormat1())
164
163
        # The upgrade should not have set up a working tree.
186
185
        branch.set_push_location('file:///IJ')
187
186
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
188
187
        converter = branch.bzrdir._format.get_converter(target)
189
 
        converter.convert(branch.bzrdir, None)
 
188
        converter.convert(branch.bzrdir, progress.DummyProgress())
190
189
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
191
190
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
192
191
        self.assertEqual('CD', new_branch.last_revision())
198
197
 
199
198
        branch2 = self.make_branch('branch2', format='knit')
200
199
        converter = branch2.bzrdir._format.get_converter(target)
201
 
        converter.convert(branch2.bzrdir, None)
 
200
        converter.convert(branch2.bzrdir, progress.DummyProgress())
202
201
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
203
202
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
204
203
 
207
206
        target = bzrdir.format_registry.make_bzrdir('1.9')
208
207
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
209
208
        converter = branch.bzrdir._format.get_converter(target)
210
 
        converter.convert(branch.bzrdir, None)
 
209
        converter.convert(branch.bzrdir, progress.DummyProgress())
211
210
        branch = _mod_branch.Branch.open(self.get_url('branch'))
212
211
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
213
212
        self.assertEqual({}, branch._get_all_reference_info())
217
216
        tree = self.make_branch_and_tree('tree', format='knit')
218
217
        target = bzrdir.format_registry.make_bzrdir('dirstate')
219
218
        converter = tree.bzrdir._format.get_converter(target)
220
 
        converter.convert(tree.bzrdir, None)
 
219
        converter.convert(tree.bzrdir, progress.DummyProgress())
221
220
        new_tree = workingtree.WorkingTree.open('tree')
222
221
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
223
222
        self.assertEqual('null:', new_tree.last_revision())
230
229
        tree.add(['file'], ['file-id'])
231
230
        target = bzrdir.format_registry.make_bzrdir('dirstate')
232
231
        converter = tree.bzrdir._format.get_converter(target)
233
 
        converter.convert(tree.bzrdir, None)
 
232
        converter.convert(tree.bzrdir, progress.DummyProgress())
234
233
        new_tree = workingtree.WorkingTree.open('tree')
235
234
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
236
235
        self.assertEqual('null:', new_tree.last_revision())
241
240
        rev_id = tree.commit('first post')
242
241
        target = bzrdir.format_registry.make_bzrdir('dirstate')
243
242
        converter = tree.bzrdir._format.get_converter(target)
244
 
        converter.convert(tree.bzrdir, None)
 
243
        converter.convert(tree.bzrdir, progress.DummyProgress())
245
244
        new_tree = workingtree.WorkingTree.open('tree')
246
245
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
247
246
        self.assertEqual(rev_id, new_tree.last_revision())
258
257
        tree.merge_from_branch(merge_tree.branch)
259
258
        target = bzrdir.format_registry.make_bzrdir('dirstate')
260
259
        converter = tree.bzrdir._format.get_converter(target)
261
 
        converter.convert(tree.bzrdir, None)
 
260
        converter.convert(tree.bzrdir, progress.DummyProgress())
262
261
        new_tree = workingtree.WorkingTree.open('tree')
263
262
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
264
263
        self.assertEqual(rev_id2, new_tree.last_revision())