← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_break_lock.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_break_lock.py
1
 
# (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
66
66
        bzrlib.ui.ui_factory.stdin = StringIO("y\ny\ny\n")
67
67
        try:
68
68
            self.unused_workingtree.break_lock()
69
 
        except NotImplementedError:
70
 
            # workingtree does not support break_lock
 
69
        except (NotImplementedError, errors.LockActive):
 
70
            # workingtree does not support break_lock,
 
71
            # or does not support breaking a lock held by an alive
 
72
            # object/process.
71
73
            self.workingtree.unlock()
72
74
            return
73
75
        self.assertRaises(errors.LockBroken, self.workingtree.unlock)