← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-27 06:10:18 UTC
  • mfrom: (3309 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080327061018-dxztpxyv6yoeg3am
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
1582
1582
                # its still held by the explicit lock we took, and the break
1583
1583
                # lock should not have touched it.
1584
1584
                repo = thisdir.open_repository()
1585
 
                orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
1586
 
                try:
1587
 
                    lockdir._DEFAULT_TIMEOUT_SECONDS = 1
1588
 
                    self.assertRaises(errors.LockContention, repo.lock_write)
1589
 
                finally:
1590
 
                    lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
 
1585
                self.assertRaises(errors.LockContention, repo.lock_write)
1591
1586
        finally:
1592
1587
            unused_repo.unlock()
1593
1588
        self.assertRaises(errors.LockBroken, master.unlock)