← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
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.
203
213
    def test_init_append_revisions_only(self):
204
214
        self.run_bzr('init --dirstate-tags normal_branch6')
205
215
        branch = _mod_branch.Branch.open('normal_branch6')
206
 
        self.assertEqual(None, branch._get_append_revisions_only())
 
216
        self.assertEqual(None, branch.get_append_revisions_only())
207
217
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
208
218
        branch = _mod_branch.Branch.open('branch6')
209
 
        self.assertEqual(True, branch._get_append_revisions_only())
 
219
        self.assertEqual(True, branch.get_append_revisions_only())
210
220
        self.run_bzr_error(['cannot be set to append-revisions-only'],
211
221
                           'init --append-revisions-only --knit knit')
212
222