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

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/lock_helpers.py
56
56
            return self._other.lock_read()
57
57
        raise TestPreventLocking('lock_read disabled')
58
58
 
59
 
    def lock_write(self):
 
59
    def lock_write(self, token=None):
60
60
        self._sequence.append((self._other_id, 'lw', self._allow_write))
61
61
        if self._allow_write:
62
62
            return self._other.lock_write()