← 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: Andrew Bennetts
  • Date: 2007-03-28 07:08:42 UTC
  • mfrom: (2380 +trunk)
  • mto: (2018.5.146 hpss)
  • mto: This revision was merged to the branch mainline in revision 2414.
  • Revision ID: andrew.bennetts@canonical.com-20070328070842-r843houy668oxb9o
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_break_lock.py
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)