~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-13 03:42:59 UTC
  • mfrom: (1658.1.5 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060413034259-6466a758a88b4a94
(mbp) ftp push fix; Working_tree.set_inventory; test suite warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
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()