~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 14:26:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105142658-vek3v6pzlxb751s2
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. 

@only_raises is evil and gave a hard time since any exception during
save_changes() was swallowed.

Possible improvements: 

- add some needs_write_lock decorators to crucial
  methods (_set_config_location ?) but keep locking the branch at higher levels

- decorate branch.unlock to call stack.save if last_lock() it True
  outside of @only_raises scope (evil decorator)

- add @needs_write_lock to stack.set and stack.remove (will probably get
  rid of most testing issues) we probably need a specialized decorator
  that can relay to the store and from there to the branch or whatever is
  needed. This will also helps bzr config to get it right. The
  get_mutable_section trick should not be needed anymore either.

- decorate branch.unlock to call stack.save if last_lock() it True outside
  of @only_raises scope (evil decorator)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
79
79
        # unlock it.
80
80
        master = self.make_branch('master')
81
81
        try:
82
 
            self.branch.bind(master)
 
82
            self.branch.lock_write()
 
83
            try:
 
84
                self.branch.bind(master)
 
85
            finally:
 
86
                self.branch.unlock()
83
87
        except errors.UpgradeRequired:
84
88
            # this branch does not support binding.
85
89
            return
86
90
        master.lock_write()
87
91
        ui.ui_factory = ui.CannedInputUIFactory([True, True])
88
92
        try:
89
 
            self.unused_branch.break_lock()
 
93
            fresh = _mod_branch.Branch.open(self.unused_branch.base)
 
94
            fresh.break_lock()
90
95
        except NotImplementedError:
91
96
            # branch does not support break_lock
92
97
            master.unlock()