← 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: Martin Pool
  • Date: 2006-03-06 03:57:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1593.
  • Revision ID: mbp@sourcefrog.net-20060306035718-a50bae3c32eec48a
Change LockDirs to format "lock-name/held/info"

For the moment, auto-create the top-level directory when it's needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
191
191
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
192
192
        repo = repository.RepositoryFormat7().initialize(control, shared=True)
193
193
        t = control.get_repository_transport(None)
194
 
        self.assertFalse(t.has('lock'))
 
194
        # TODO: Should check there is a 'lock' toplevel directory, 
 
195
        # regardless of contents
 
196
        self.assertFalse(t.has('lock/held/info'))
195
197
        repo.lock_write()
196
 
        self.assertTrue(t.has('lock'))
197
 
        self.assertTrue(t.has('lock/info'))
 
198
        self.assertTrue(t.has('lock/held/info'))
198
199
 
199
200
    def test_uses_lockdir(self):
200
201
        """repo format 7 actually locks on lockdir"""
207
208
        del repo
208
209
        # make sure the same lock is created by opening it
209
210
        repo = repository.Repository.open(base_url)
210
 
        self.assertFalse(t.has('lock'))
211
211
        repo.lock_write()
212
 
        self.assertTrue(t.has('lock'))
213
 
        self.assertTrue(t.has('lock/info'))
214
 
        self.assertTrue(S_ISDIR(t.stat('lock').st_mode))
 
212
        self.assertTrue(t.has('lock/held/info'))
215
213
        repo.unlock()
216
 
        self.assertFalse(t.has('lock'))
 
214
        self.assertFalse(t.has('lock/held/info'))
217
215
 
218
216
    def test_shared_no_tree_disk_layout(self):
219
217
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())