← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
293
293
            self._fake_read_lock = False
294
294
            return
295
295
        if not self._lock_held:
296
 
            return lock.cant_unlock_not_held(self)
 
296
            raise LockNotHeld(self)
297
297
        if self._locked_via_token:
298
298
            self._locked_via_token = False
299
299
            self._lock_held = False
325
325
            self._trace("... unlock succeeded after %dms",
326
326
                    (time.time() - start_time) * 1000)
327
327
            result = lock.LockResult(self.transport.abspath(self.path),
328
 
                                     old_nonce)
 
328
                old_nonce)
329
329
            for hook in self.hooks['lock_released']:
330
330
                hook(result)
331
331
 
379
379
            raise LockBreakMismatch(self, broken_info, dead_holder_info)
380
380
        self.transport.delete(broken_info_path)
381
381
        self.transport.rmdir(tmpname)
382
 
        result = lock.LockResult(self.transport.abspath(self.path),
383
 
                                 current_info.get('nonce'))
384
 
        for hook in self.hooks['lock_broken']:
385
 
            hook(result)
386
382
 
387
383
    def _check_not_locked(self):
388
384
        """If the lock is held by this instance, raise an error."""