~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.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) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007-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
312
312
 
313
313
    def test_gather_related_braches(self):
314
314
        branch = self.make_branch('.')
315
 
        branch.set_public_branch('baz')
316
 
        branch.set_push_location('bar')
317
 
        branch.set_parent('foo')
318
 
        branch.set_submit_branch('qux')
 
315
        branch.lock_write()
 
316
        try:
 
317
            branch.set_public_branch('baz')
 
318
            branch.set_push_location('bar')
 
319
            branch.set_parent('foo')
 
320
            branch.set_submit_branch('qux')
 
321
        finally:
 
322
            branch.unlock()
319
323
        self.assertEqual(
320
324
            [('public branch', 'baz'), ('push branch', 'bar'),
321
325
             ('parent branch', 'foo'), ('submit branch', 'qux')],