/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge bzr.dev, resolve conflicts.

Check failing tests:

- bug #225020 is back under a different ugly head. But I don't think it's
  worth working around it *again* given that: it's a bug in curl and
  fixed there (in 7.19, still need checking for 7.18.2 available in
  intrepid), occurs only in the test suite and only with
  python-2.7.0alpha0, I need a true python-2.6 (wip).

- more problematic are the thread leaks, it seems that python-2.6 refuse
  to spawn more than 256 and the whole test suite hits that
  limit. Re-running failing tests with --starting-with succeeds.

- some test_read_bundle tests fail with a curl connection error (server
  certificate verification failed) but they use the wrong CAfile (need
  investigaton, most probably a wrong setUp, we need to use a CAfile that
  knows about the test server).

Show diffs side-by-side

added added

removed removed

Lines of Context:
515
515
            branch.repository.unlock()
516
516
        finally:
517
517
            branch.unlock()
 
518
 
 
519
    def test_lock_and_unlock_leaves_repo_unlocked(self):
 
520
        branch = self.make_branch('b')
 
521
        branch.lock_write()
 
522
        branch.unlock()
 
523
        self.assertRaises(errors.LockNotHeld, branch.repository.unlock)
 
524