/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 tests/test_cache.py

Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_cache.py
40
40
    TestCaseInTempDir,
41
41
    UnavailableFeature,
42
42
    )
 
43
from bzrlib.transport import (
 
44
    get_transport,
 
45
    )
43
46
 
44
47
from bzrlib.plugins.git.cache import (
 
48
    DictBzrGitCache,
 
49
    IndexBzrGitCache,
 
50
    IndexGitCacheFormat,
45
51
    SqliteBzrGitCache,
46
 
    DictBzrGitCache,
47
52
    TdbBzrGitCache,
48
53
    )
49
54
 
65
70
        self.map.start_write_group()
66
71
        updater = self.cache.get_updater(Revision("myrevid"))
67
72
        c = self._get_test_commit()
68
 
        updater.add_object(c, None)
 
73
        updater.add_object(c, {
 
74
            "testament3-sha1": "cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
 
75
            None)
69
76
        updater.finish()
70
77
        self.map.commit_write_group()
71
78
        self.assertEquals(
72
 
            ("commit", ("myrevid", "cc9462f7f8263ef5adfbeff2fb936bb36b504cba")),
 
79
            ("commit", ("myrevid",
 
80
                "cc9462f7f8263ef5adfbeff2fb936bb36b504cba",
 
81
                {"testament3-sha1": "cc9462f7f8263ef5adf8eff2fb936bb36b504cba"},
 
82
                )),
73
83
            self.map.lookup_git_sha(c.id))
74
84
        self.assertEquals(c.id, self.map.lookup_commit("myrevid"))
75
85
 
80
90
    def test_blob(self):
81
91
        self.map.start_write_group()
82
92
        updater = self.cache.get_updater(Revision("myrevid"))
83
 
        updater.add_object(self._get_test_commit(), None)
 
93
        updater.add_object(self._get_test_commit(), { "testament3-sha1": "Test" }, None)
84
94
        b = Blob()
85
95
        b.data = "TEH BLOB"
86
96
        ie = InventoryFile("myfileid", "somename", ROOT_ID)
87
97
        ie.revision = "myrevid"
88
 
        updater.add_object(b, ie)
 
98
        updater.add_object(b, ie, None)
89
99
        updater.finish()
90
100
        self.map.commit_write_group()
91
101
        self.assertEquals(
97
107
    def test_tree(self):
98
108
        self.map.start_write_group()
99
109
        updater = self.cache.get_updater(Revision("myrevid"))
100
 
        updater.add_object(self._get_test_commit(), None)
 
110
        updater.add_object(self._get_test_commit(), {
 
111
            "testament3-sha1": "mytestamentsha" }, None)
101
112
        t = Tree()
102
113
        t.add(stat.S_IFREG, "somename", Blob().id)
103
114
        ie = InventoryDirectory("fileid", "myname", ROOT_ID)
104
115
        ie.revision = "irrelevant"
105
 
        updater.add_object(t, ie)
 
116
        updater.add_object(t, ie, "")
106
117
        updater.finish()
107
118
        self.map.commit_write_group()
108
119
        self.assertEquals(("tree", ("fileid", "myrevid")),
118
129
        self.map.start_write_group()
119
130
        updater = self.cache.get_updater(Revision("myrevid"))
120
131
        c = self._get_test_commit()
121
 
        updater.add_object(c, None)
 
132
        updater.add_object(c, {"testament3-sha1": "mtestament"}, None)
122
133
        updater.finish()
123
134
        self.map.commit_write_group()
124
135
        self.assertEquals(["myrevid"], list(self.map.revids()))
127
138
        self.map.start_write_group()
128
139
        updater = self.cache.get_updater(Revision("myrevid"))
129
140
        c = self._get_test_commit()
130
 
        updater.add_object(c, None)
 
141
        updater.add_object(c, {"testament3-sha1": "testament"}, None)
131
142
        updater.finish()
132
143
        self.map.commit_write_group()
133
144
        self.assertEquals(set(["lala", "bla"]),
159
170
        except ImportError:
160
171
            raise UnavailableFeature("Missing tdb")
161
172
        self.map = self.cache.idmap
 
173
 
 
174
 
 
175
class IndexGitShaMapTests(TestCaseInTempDir,TestGitShaMap):
 
176
 
 
177
    def setUp(self):
 
178
        TestCaseInTempDir.setUp(self)
 
179
        transport = get_transport(self.test_dir)
 
180
        IndexGitCacheFormat().initialize(transport)
 
181
        self.cache = IndexBzrGitCache(transport)
 
182
        self.map = self.cache.idmap