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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
157
157
        t = control.get_repository_transport(None)
158
158
        self.assertEqualDiff('Bazaar-NG Repository format 7',
159
159
                             t.get('format').read())
160
 
        self.assertEqualDiff('', t.get('lock').read())
161
160
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
162
161
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
163
162
        self.assertEqualDiff('# bzr weave file v5\n'
170
169
        repo = repository.RepositoryFormat7().initialize(control, shared=True)
171
170
        # we want:
172
171
        # format 'Bazaar-NG Repository format 7'
173
 
        # lock ''
174
172
        # inventory.weave == empty_weave
175
173
        # empty revision-store directory
176
174
        # empty weaves directory
177
175
        # a 'shared-storage' marker file.
 
176
        # lock is not present when unlocked
178
177
        t = control.get_repository_transport(None)
179
178
        self.assertEqualDiff('Bazaar-NG Repository format 7',
180
179
                             t.get('format').read())
181
 
        self.assertEqualDiff('', t.get('lock').read())
182
180
        self.assertEqualDiff('', t.get('shared-storage').read())
183
181
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
184
182
        self.assertTrue(S_ISDIR(t.stat('weaves').st_mode))
186
184
                             'w\n'
187
185
                             'W\n',
188
186
                             t.get('inventory.weave').read())
 
187
        self.assertFalse(t.has('branch-lock'))
 
188
 
 
189
    def test_creates_lockdir(self):
 
190
        """Make sure it appears to be controlled by a LockDir existence"""
 
191
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
 
192
        repo = repository.RepositoryFormat7().initialize(control, shared=True)
 
193
        t = control.get_repository_transport(None)
 
194
        # TODO: Should check there is a 'lock' toplevel directory, 
 
195
        # regardless of contents
 
196
        self.assertFalse(t.has('lock/held/info'))
 
197
        repo.lock_write()
 
198
        self.assertTrue(t.has('lock/held/info'))
 
199
 
 
200
    def test_uses_lockdir(self):
 
201
        """repo format 7 actually locks on lockdir"""
 
202
        base_url = self.get_url()
 
203
        control = bzrdir.BzrDirMetaFormat1().initialize(base_url)
 
204
        repo = repository.RepositoryFormat7().initialize(control, shared=True)
 
205
        t = control.get_repository_transport(None)
 
206
        repo.lock_write()
 
207
        repo.unlock()
 
208
        del repo
 
209
        # make sure the same lock is created by opening it
 
210
        repo = repository.Repository.open(base_url)
 
211
        repo.lock_write()
 
212
        self.assertTrue(t.has('lock/held/info'))
 
213
        repo.unlock()
 
214
        self.assertFalse(t.has('lock/held/info'))
189
215
 
190
216
    def test_shared_no_tree_disk_layout(self):
191
217
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
201
227
        t = control.get_repository_transport(None)
202
228
        self.assertEqualDiff('Bazaar-NG Repository format 7',
203
229
                             t.get('format').read())
204
 
        self.assertEqualDiff('', t.get('lock').read())
 
230
        ## self.assertEqualDiff('', t.get('lock').read())
205
231
        self.assertEqualDiff('', t.get('shared-storage').read())
206
232
        self.assertEqualDiff('', t.get('no-working-trees').read())
207
233
        repo.set_make_working_trees(True)
224
250
        repo.unlock()
225
251
        # we want:
226
252
        # format 'Bazaar-NG Knit Repository Format 1'
227
 
        # lock ''
 
253
        # lock: is a directory
228
254
        # inventory.weave == empty_weave
229
255
        # empty revision-store directory
230
256
        # empty weaves directory
231
257
        t = control.get_repository_transport(None)
232
258
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
233
259
                             t.get('format').read())
234
 
        self.assertEqualDiff('', t.get('lock').read())
 
260
        # XXX: no locks left when unlocked at the moment
 
261
        # self.assertEqualDiff('', t.get('lock').read())
235
262
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
236
263
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
 
264
        self.assertTrue(S_ISDIR(t.stat('lock').st_mode))
237
265
        # cheating and using a weave for now.
238
266
        self.assertEqualDiff('# bzr weave file v5\n'
239
267
                             'w\n'
245
273
        repo = repository.RepositoryFormatKnit1().initialize(control, shared=True)
246
274
        # we want:
247
275
        # format 'Bazaar-NG Knit Repository Format 1'
248
 
        # lock ''
 
276
        # lock: is a directory
249
277
        # inventory.weave == empty_weave
250
278
        # empty revision-store directory
251
279
        # empty weaves directory
253
281
        t = control.get_repository_transport(None)
254
282
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
255
283
                             t.get('format').read())
256
 
        self.assertEqualDiff('', t.get('lock').read())
 
284
        # XXX: no locks left when unlocked at the moment
 
285
        # self.assertEqualDiff('', t.get('lock').read())
257
286
        self.assertEqualDiff('', t.get('shared-storage').read())
258
287
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
259
288
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
 
289
        self.assertTrue(S_ISDIR(t.stat('lock').st_mode))
260
290
        # cheating and using a weave for now.
261
291
        self.assertEqualDiff('# bzr weave file v5\n'
262
292
                             'w\n'
277
307
        t = control.get_repository_transport(None)
278
308
        self.assertEqualDiff('Bazaar-NG Knit Repository Format 1',
279
309
                             t.get('format').read())
280
 
        self.assertEqualDiff('', t.get('lock').read())
 
310
        # XXX: no locks left when unlocked at the moment
 
311
        # self.assertEqualDiff('', t.get('lock').read())
281
312
        self.assertEqualDiff('', t.get('shared-storage').read())
282
313
        self.assertEqualDiff('', t.get('no-working-trees').read())
283
314
        repo.set_make_working_trees(True)
284
315
        self.assertFalse(t.has('no-working-trees'))
285
316
        self.assertTrue(S_ISDIR(t.stat('revision-store').st_mode))
286
317
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
 
318
        self.assertTrue(S_ISDIR(t.stat('lock').st_mode))
287
319
        # cheating and using a weave for now.
288
320
        self.assertEqualDiff('# bzr weave file v5\n'
289
321
                             'w\n'