← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-08 03:34:31 UTC
  • mfrom: (4266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4267.
  • Revision ID: tanner@real-time.com-20090408033431-draj0u7nd9bbby53
Merge 1.14rc1 back bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
214
214
            # raise TokenMismatch.
215
215
            self.assertRaises(errors.TokenMismatch,
216
216
                              self.lockable.lock_write, token=different_token)
217
 
            # A seperate instance for the same lockable will also raise
 
217
            # A separate instance for the same lockable will also raise
218
218
            # TokenMismatch.
219
219
            # This detects the case where a caller claims to have a lock (via
220
220
            # the token) for an external resource, but doesn't (the token is
221
 
            # different).  Clients need a seperate lock object to make sure the
 
221
            # different).  Clients need a separate lock object to make sure the
222
222
            # external resource is probed, whereas the existing lock object
223
223
            # might cache.
224
224
            new_lockable = self.get_lockable()