← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-10 05:26:37 UTC
  • mfrom: (1645.1.1 mergeui)
  • Revision ID: pqm@pqm.ubuntu.com-20060410052637-9c6229889bc13061
Implement single-file merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
195
195
        # regardless of contents
196
196
        self.assertFalse(t.has('lock/held/info'))
197
197
        repo.lock_write()
198
 
        try:
199
 
            self.assertTrue(t.has('lock/held/info'))
200
 
        finally:
201
 
            # unlock so we don't get a warning about failing to do so
202
 
            repo.unlock()
 
198
        self.assertTrue(t.has('lock/held/info'))
203
199
 
204
200
    def test_uses_lockdir(self):
205
201
        """repo format 7 actually locks on lockdir"""
266
262
        self.assertTrue(S_ISDIR(t.stat('knits').st_mode))
267
263
        self.check_knits(t)
268
264
 
269
 
    def assertHasKnit(self, t, knit_name):
270
 
        """Assert that knit_name exists on t."""
271
 
        self.assertEqualDiff('# bzr knit index 7\n',
272
 
                             t.get(knit_name + '.kndx').read())
273
 
        # no default content
274
 
        self.assertTrue(t.has(knit_name + '.knit'))
275
 
 
276
265
    def check_knits(self, t):
277
266
        """check knit content for a repository."""
278
 
        self.assertHasKnit(t, 'inventory')
279
 
        self.assertHasKnit(t, 'revisions')
280
 
        self.assertHasKnit(t, 'signatures')
 
267
        self.assertEqualDiff('# bzr knit index 7\n',
 
268
                             t.get('inventory.kndx').read())
 
269
        # no default content
 
270
        self.assertTrue(t.has('inventory.knit'))
 
271
        self.assertEqualDiff('# bzr knit index 7\n',
 
272
                             t.get('revisions.kndx').read())
 
273
        # no default content
 
274
        self.assertTrue(t.has('revisions.knit'))
 
275
        self.assertEqualDiff('# bzr knit index 7\n',
 
276
                             t.get('signatures.kndx').read())
 
277
        # no default content
 
278
        self.assertTrue(t.has('signatures.knit'))
281
279
 
282
280
    def test_shared_disk_layout(self):
283
281
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())