← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.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:
bzrlib/tests/test_branch.py
1
 
# Copyright (C) 2006-2011 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
351
351
    def test_config(self):
352
352
        """Ensure that all configuration data is stored in the branch"""
353
353
        branch = self.make_branch('a', format=self.get_format_name())
 
354
        self.addCleanup(branch.lock_write().unlock)
354
355
        branch.set_parent('http://example.com')
355
356
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
356
357
        self.assertEqual('http://example.com', branch.get_parent())
357
358
        branch.set_push_location('sftp://example.com')
358
 
        config = branch.get_config()._get_branch_data_config()
359
 
        self.assertEqual('sftp://example.com',
360
 
                         config.get_user_option('push_location'))
 
359
        conf = branch.get_config_stack()
 
360
        self.assertEqual('sftp://example.com', conf.get('push_location'))
361
361
        branch.set_bound_location('ftp://example.com')
362
362
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
363
363
        self.assertEqual('ftp://example.com', branch.get_bound_location())
666
666
    def check_append_revisions_only(self, expected_value, value=None):
667
667
        """Set append_revisions_only in config and check its interpretation."""
668
668
        if value is not None:
669
 
            self.config_stack.set('append_revisions_only', value)
 
669
            self.branch.lock_write()
 
670
            try:
 
671
                self.config_stack.set('append_revisions_only', value)
 
672
            finally:
 
673
                self.branch.unlock()
670
674
        self.assertEqual(expected_value,
671
675
                         self.branch.get_append_revisions_only())
672
676