← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-14 17:02:35 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051114170235-f85afa458bae956e
Fixing up the error message for a failed bind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_upgrade.py
19
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
 
# TODO queue for upgrade:
23
 
# test the error message when upgrading an unknown BzrDir format.
24
 
 
25
22
import base64
26
23
import os
27
24
import sys
28
25
 
29
 
import bzrlib.branch
 
26
from bzrlib.selftest import TestCase, TestCaseInTempDir
30
27
from bzrlib.branch import Branch
31
 
import bzrlib.bzrdir as bzrdir
32
 
import bzrlib.repository as repository
33
28
from bzrlib.revision import is_ancestor
34
 
from bzrlib.tests import TestCase, TestCaseInTempDir
35
 
from bzrlib.transport import get_transport
36
29
from bzrlib.upgrade import upgrade
37
 
import bzrlib.workingtree as workingtree
 
30
from bzrlib.selftest.treeshape import build_tree_contents
38
31
 
39
32
 
40
33
class TestUpgrade(TestCaseInTempDir):
41
34
    
42
35
    def test_build_tree(self):
43
36
        """Test tree-building test helper"""
44
 
        self.build_tree_contents(_upgrade1_template)
 
37
        build_tree_contents(_upgrade1_template)
45
38
        self.failUnlessExists('foo')
46
39
        self.failUnlessExists('.bzr/README')
47
40
 
48
41
    def test_upgrade_simple(self):
49
42
        """Upgrade simple v0.0.4 format to v6"""
50
43
        eq = self.assertEquals
51
 
        self.build_tree_contents(_upgrade1_template)
52
 
        upgrade(u'.')
53
 
        control = bzrdir.BzrDir.open('.')
54
 
        b = control.open_branch()
55
 
        # tsk, peeking under the covers.
56
 
        self.failUnless(
57
 
            isinstance(
58
 
                control._format,
59
 
                bzrdir.BzrDirFormat.get_default_format().__class__))
 
44
        build_tree_contents(_upgrade1_template)
 
45
        upgrade('.')
 
46
        b = Branch.open('.')
 
47
        eq(b._branch_format, 6)
60
48
        rh = b.revision_history()
61
49
        eq(rh,
62
50
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
63
51
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
64
 
        rt = b.repository.revision_tree(rh[0])
 
52
        t = b.revision_tree(rh[0])
65
53
        foo_id = 'foo-20051004035605-91e788d1875603ae'
66
 
        eq(rt.get_file_text(foo_id), 'initial contents\n')
67
 
        rt = b.repository.revision_tree(rh[1])
68
 
        eq(rt.get_file_text(foo_id), 'new contents\n')
69
 
        # 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')
 
54
        eq(t.get_file_text(foo_id), 'initial contents\n')
 
55
        t = b.revision_tree(rh[1])
 
56
        eq(t.get_file_text(foo_id), 'new contents\n')
91
57
 
92
58
    def test_upgrade_with_ghosts(self):
93
59
        """Upgrade v0.0.4 tree containing ghost references.
94
60
 
95
61
        That is, some of the parents of revisions mentioned in the branch
96
 
        aren't present in the branch's storage. 
 
62
        aren't present in the branches storage. 
97
63
 
98
64
        This shouldn't normally happen in branches created entirely in 
99
 
        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 
 
65
        bzr but can happen in imports from baz and arch, or from other  
 
66
        systems, where the importer knows about a revision but not 
101
67
        its contents."""
102
68
        eq = self.assertEquals
103
 
        self.build_tree_contents(_ghost_template)
104
 
        upgrade(u'.')
105
 
        b = Branch.open(u'.')
 
69
        build_tree_contents(_ghost_template)
 
70
        upgrade('.')
 
71
        b = Branch.open('.')
106
72
        revision_id = b.revision_history()[1]
107
 
        rev = b.repository.get_revision(revision_id)
 
73
        rev = b.get_revision(revision_id)
108
74
        eq(len(rev.parent_ids), 2)
109
75
        eq(rev.parent_ids[1], 'wibble@wobble-2')
110
76
 
111
77
    def test_upgrade_makes_dir_weaves(self):
112
 
        self.build_tree_contents(_upgrade_dir_template)
113
 
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
114
 
        old_repo_format = old_repodir.open_repository()._format
 
78
        build_tree_contents(_upgrade_dir_template)
115
79
        upgrade('.')
116
80
        # this is the path to the literal file. As format changes 
117
81
        # occur it needs to be updated. FIXME: ask the store for the
118
82
        # path.
119
 
        repo = bzrlib.repository.Repository.open('.')
120
 
        # it should have changed the format
121
 
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
122
 
        # and we should be able to read the names for the file id 
123
 
        # 'dir-20051005095101-da1441ea3fa6917a'
124
 
        self.assertNotEqual(
125
 
            [],
126
 
            repo.text_store.get_weave(
127
 
                'dir-20051005095101-da1441ea3fa6917a',
128
 
                repo.get_transaction()))
129
 
 
130
 
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
131
 
        self.build_tree_contents(_upgrade_dir_template)
132
 
        upgrade('.', bzrdir.BzrDirMetaFormat1())
133
 
        tree = workingtree.WorkingTree.open('.')
134
 
        self.assertEqual(tree.last_revision(),
135
 
                         tree.branch.revision_history()[-1])
 
83
        self.failUnlessExists(
 
84
            '.bzr/weaves/de/dir-20051005095101-da1441ea3fa6917a.weave')
136
85
 
137
86
 
138
87
_upgrade1_template = \