← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_locking.py

  • Committer: Martin
  • Date: 2009-11-07 08:02:13 UTC
  • mfrom: (4789 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4809.
  • Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_locking.py
139
139
        try:
140
140
            self.assertTrue(b.is_locked())
141
141
            self.assertTrue(b.repository.is_locked())
142
 
            self.assertRaises(TestPreventLocking, b.unlock)
 
142
            self.assertLogsError(TestPreventLocking, b.unlock)
143
143
            if self.combined_control:
144
144
                self.assertTrue(b.is_locked())
145
145
            else:
183
183
        try:
184
184
            self.assertTrue(b.is_locked())
185
185
            self.assertTrue(b.repository.is_locked())
186
 
            self.assertRaises(TestPreventLocking, b.unlock)
 
186
            self.assertLogsError(TestPreventLocking, b.unlock)
187
187
            self.assertTrue(b.is_locked())
188
188
            self.assertTrue(b.repository.is_locked())
189
189