← 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: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
668
668
    def setUp(self):
669
669
        super(TestBranchOptions, self).setUp()
670
670
        self.branch = self.make_branch('.')
671
 
        self.config = self.branch.get_config()
 
671
        self.config_stack = self.branch.get_config_stack()
672
672
 
673
673
    def check_append_revisions_only(self, expected_value, value=None):
674
674
        """Set append_revisions_only in config and check its interpretation."""
675
675
        if value is not None:
676
 
            self.config.set_user_option('append_revisions_only', value)
 
676
            self.config_stack.set('append_revisions_only', value)
677
677
        self.assertEqual(expected_value,
678
678
                         self.branch.get_append_revisions_only())
679
679
 
680
680
    def test_valid_append_revisions_only(self):
681
681
        self.assertEquals(None,
682
 
                          self.config.get_user_option('append_revisions_only'))
 
682
                          self.config_stack.get('append_revisions_only'))
683
683
        self.check_append_revisions_only(None)
684
684
        self.check_append_revisions_only(False, 'False')
685
685
        self.check_append_revisions_only(True, 'True')
697
697
        self.check_append_revisions_only(None, 'not-a-bool')
698
698
        self.assertLength(1, self.warnings)
699
699
        self.assertEqual(
700
 
            'Value "not-a-bool" is not a boolean for "append_revisions_only"',
 
700
            'Value "not-a-bool" is not valid for "append_revisions_only"',
701
701
            self.warnings[0])
702
702
 
703
703