← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
388
388
        wt = bound.open_workingtree()
389
389
        wt.branch.set_bound_location(os.path.realpath('master'))
390
390
        master_branch.lock_write()
391
 
        self.assertRaises(LockContention, wt.commit, 'silly')
 
391
        try:
 
392
            self.assertRaises(LockContention, wt.commit, 'silly')
 
393
        finally:
 
394
            master_branch.unlock()