← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_init.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-30 14:30:10 UTC
  • mfrom: (6615.3.7 merges)
  • mto: This revision was merged to the branch mainline in revision 6621.
  • Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge  2.7 into trunk including fix for bug #1657238

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
36
36
class TestInit(TestCaseWithTransport):
37
37
 
38
38
    def setUp(self):
39
 
        TestCaseWithTransport.setUp(self)
 
39
        super(TestInit, self).setUp()
40
40
        self._default_label = '2a'
41
41
 
42
42
    def test_init_with_format(self):
168
168
 
169
169
    def test_init_default_format_option(self):
170
170
        """bzr init should read default format from option default_format"""
171
 
        conf = _mod_config.GlobalConfig.from_string('''
 
171
        g_store = _mod_config.GlobalStore()
 
172
        g_store._load_from_string('''
172
173
[DEFAULT]
173
174
default_format = 1.9
174
 
''', save=True)
 
175
''')
 
176
        g_store.save()
175
177
        out, err = self.run_bzr_subprocess('init')
176
178
        self.assertContainsRe(out, '1.9')
177
179