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

Improve error message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_object_store.py
28
28
    )
29
29
from bzrlib.graph import (
30
30
    DictParentsProvider,
 
31
    Graph,
31
32
    )
32
33
from bzrlib.tests import (
33
34
    TestCase,
71
72
 
72
73
    def _find_missing(self, ancestry, want, have):
73
74
        return _find_missing_bzr_revids(
74
 
            DictParentsProvider(ancestry).get_parent_map,
 
75
            Graph(DictParentsProvider(ancestry)),
75
76
            set(want), set(have))
76
77
 
77
78
    def test_simple(self):
140
141
    def test_get_blob(self):
141
142
        b = Blob()
142
143
        b.data = 'a\nb\nc\nd\ne\n'
 
144
        self.store.lock_read()
 
145
        self.addCleanup(self.store.unlock)
143
146
        self.assertRaises(KeyError, self.store.__getitem__, b.id)
144
147
        bb = BranchBuilder(branch=self.branch)
145
148
        bb.start_series()
148
151
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
149
152
             ])
150
153
        bb.finish_series()
 
154
        # read locks cache
 
155
        self.assertRaises(KeyError, self.store.__getitem__, b.id)
 
156
        self.store.unlock()
 
157
        self.store.lock_read()
151
158
        self.assertEquals(b, self.store[b.id])
152
159
 
153
160
    def test_get_raw(self):
154
161
        b = Blob()
155
162
        b.data = 'a\nb\nc\nd\ne\n'
 
163
        self.store.lock_read()
 
164
        self.addCleanup(self.store.unlock)
156
165
        self.assertRaises(KeyError, self.store.get_raw, b.id)
157
166
        bb = BranchBuilder(branch=self.branch)
158
167
        bb.start_series()
161
170
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
162
171
             ])
163
172
        bb.finish_series()
 
173
        # read locks cache
 
174
        self.assertRaises(KeyError, self.store.get_raw, b.id)
 
175
        self.store.unlock()
 
176
        self.store.lock_read()
164
177
        self.assertEquals(b.as_raw_string(), self.store.get_raw(b.id)[1])
165
178
 
166
179
    def test_contains(self):
167
180
        b = Blob()
168
181
        b.data = 'a\nb\nc\nd\ne\n'
 
182
        self.store.lock_read()
 
183
        self.addCleanup(self.store.unlock)
169
184
        self.assertFalse(b.id in self.store)
170
185
        bb = BranchBuilder(branch=self.branch)
171
186
        bb.start_series()
174
189
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
175
190
             ])
176
191
        bb.finish_series()
 
192
        # read locks cache
 
193
        self.assertFalse(b.id in self.store)
 
194
        self.store.unlock()
 
195
        self.store.lock_read()
177
196
        self.assertTrue(b.id in self.store)
178
197
 
179
198