~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
47
47
        self.assertIsDirectory('.bzr/checkout', t)
48
48
        self.assertIsDirectory('.bzr/checkout/lock', t)
49
49
 
50
 
    def test_init_weave(self):
51
 
        # --format=weave should be accepted to allow interoperation with
52
 
        # old releases when desired.
53
 
        out, err = self.run_bzr('init --format=weave')
54
 
        self.assertEqual("""Created a standalone tree (format: weave)\n""",
55
 
            out)
56
 
        self.assertEqual('', err)
57
 
 
58
50
    def test_init_format_2a(self):
59
 
        """Smoke test for constructing a format 2a repoistory."""
 
51
        """Smoke test for constructing a format 2a repository."""
60
52
        out, err = self.run_bzr('init --format=2a')
61
53
        self.assertEqual("""Created a standalone tree (format: 2a)\n""",
62
54
            out)
63
55
        self.assertEqual('', err)
64
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
 
65
67
    def test_init_at_repository_root(self):
66
68
        # bzr init at the root of a repository should create a branch
67
69
        # and working tree even when creation of working trees is disabled.
108
110
        # init an existing branch.
109
111
        out, err = self.run_bzr('init subdir2', retcode=3)
110
112
        self.assertEqual('', out)
111
 
        self.failUnless(err.startswith('bzr: ERROR: Already a branch:'))
 
113
        self.assertTrue(err.startswith('bzr: ERROR: Already a branch:'))
112
114
 
113
115
    def test_init_branch_quiet(self):
114
116
        out, err = self.run_bzr('init -q')
162
164
        self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
163
165
                            'init ../new/tree', working_dir='tree')
164
166
        self.run_bzr('init ../new/tree --create-prefix', working_dir='tree')
165
 
        self.failUnlessExists('new/tree/.bzr')
 
167
        self.assertPathExists('new/tree/.bzr')
166
168
 
167
169
    def test_init_default_format_option(self):
168
170
        """bzr init should read default format from option default_format"""
211
213
    def test_init_append_revisions_only(self):
212
214
        self.run_bzr('init --dirstate-tags normal_branch6')
213
215
        branch = _mod_branch.Branch.open('normal_branch6')
214
 
        self.assertEqual(None, branch._get_append_revisions_only())
 
216
        self.assertEqual(None, branch.get_append_revisions_only())
215
217
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
216
218
        branch = _mod_branch.Branch.open('branch6')
217
 
        self.assertEqual(True, branch._get_append_revisions_only())
 
219
        self.assertEqual(True, branch.get_append_revisions_only())
218
220
        self.run_bzr_error(['cannot be set to append-revisions-only'],
219
221
                           'init --append-revisions-only --knit knit')
220
222
 
226
228
        # and uses whoami only in a lock file. Without whoami the login name
227
229
        # is used. This test is to ensure that init passes even when whoami
228
230
        # is not available.
229
 
        osutils.set_or_unset_env('EMAIL', None)
230
 
        osutils.set_or_unset_env('BZR_EMAIL', None)
 
231
        self.overrideEnv('EMAIL', None)
 
232
        self.overrideEnv('BZR_EMAIL', None)
231
233
        out, err = self.run_bzr(['init', 'foo'])
232
234
        self.assertEqual(err, '')
233
235
        self.assertTrue(os.path.exists('foo'))
234
 
        
 
236