← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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):
48
48
        self.assertIsDirectory('.bzr/checkout/lock', t)
49
49
 
50
50
    def test_init_format_2a(self):
51
 
        """Smoke test for constructing a format 2a repoistory."""
 
51
        """Smoke test for constructing a format 2a repository."""
52
52
        out, err = self.run_bzr('init --format=2a')
53
53
        self.assertEqual("""Created a standalone tree (format: 2a)\n""",
54
54
            out)
55
55
        self.assertEqual('', err)
56
56
 
 
57
    def test_init_colocated(self):
 
58
        """Smoke test for constructing a colocated branch."""
 
59
        out, err = self.run_bzr('init --format=development-colo file:,branch=abranch')
 
60
        self.assertEqual("""Created a lightweight checkout (format: development-colo)\n""",
 
61
            out)
 
62
        self.assertEqual('', err)
 
63
        out, err = self.run_bzr('branches')
 
64
        self.assertEqual("  abranch\n", out)
 
65
        self.assertEqual('', err)
 
66
 
57
67
    def test_init_at_repository_root(self):
58
68
        # bzr init at the root of a repository should create a branch
59
69
        # and working tree even when creation of working trees is disabled.
158
168
 
159
169
    def test_init_default_format_option(self):
160
170
        """bzr init should read default format from option default_format"""
161
 
        conf = _mod_config.GlobalConfig.from_string('''
 
171
        g_store = _mod_config.GlobalStore()
 
172
        g_store._load_from_string('''
162
173
[DEFAULT]
163
174
default_format = 1.9
164
 
''', save=True)
 
175
''')
 
176
        g_store.save()
165
177
        out, err = self.run_bzr_subprocess('init')
166
178
        self.assertContainsRe(out, '1.9')
167
179
 
203
215
    def test_init_append_revisions_only(self):
204
216
        self.run_bzr('init --dirstate-tags normal_branch6')
205
217
        branch = _mod_branch.Branch.open('normal_branch6')
206
 
        self.assertEqual(None, branch._get_append_revisions_only())
 
218
        self.assertEqual(None, branch.get_append_revisions_only())
207
219
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
208
220
        branch = _mod_branch.Branch.open('branch6')
209
 
        self.assertEqual(True, branch._get_append_revisions_only())
 
221
        self.assertEqual(True, branch.get_append_revisions_only())
210
222
        self.run_bzr_error(['cannot be set to append-revisions-only'],
211
223
                           'init --append-revisions-only --knit knit')
212
224