~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-12-09 23:53:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209235350-qp39yk0xzx7a4f6p
Don't use the base if not cherrypicking

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
25
 
    urlutils,
26
25
    )
27
26
from bzrlib.bzrdir import BzrDirMetaFormat1
28
27
from bzrlib.tests import TestSkipped
45
44
        # --format=weave should be accepted to allow interoperation with
46
45
        # old releases when desired.
47
46
        out, err = self.run_bzr('init --format=weave')
48
 
        self.assertEqual("""Created a standalone tree (format: weave)\n""",
49
 
            out)
 
47
        self.assertEqual('', out)
50
48
        self.assertEqual('', err)
51
49
 
52
50
    def test_init_at_repository_root(self):
59
57
        repo = newdir.create_repository(shared=True)
60
58
        repo.set_make_working_trees(False)
61
59
        out, err = self.run_bzr('init repo')
62
 
        self.assertEqual("""Created a repository tree (format: pack-0.92)
63
 
Using shared repository: %s
64
 
""" % urlutils.local_path_from_url(
65
 
            repo.bzrdir.root_transport.external_url()), out)
66
 
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
67
 
            "test_init_at_repository_root/work/repo/\n")
 
60
        self.assertEqual('', out)
68
61
        self.assertEqual('', err)
69
62
        newdir.open_branch()
70
63
        newdir.open_workingtree()
71
 
 
 
64
        
72
65
    def test_init_branch(self):
73
66
        out, err = self.run_bzr('init')
74
 
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
75
 
            out)
 
67
        self.assertEqual('', out)
76
68
        self.assertEqual('', err)
77
69
 
78
70
        # Can it handle subdirectories of branches too ?
79
71
        out, err = self.run_bzr('init subdir1')
80
 
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
81
 
            out)
 
72
        self.assertEqual('', out)
82
73
        self.assertEqual('', err)
83
74
        WorkingTree.open('subdir1')
84
75
        
89
80
        
90
81
        os.mkdir('subdir2')
91
82
        out, err = self.run_bzr('init subdir2')
92
 
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
93
 
            out)
 
83
        self.assertEqual('', out)
94
84
        self.assertEqual('', err)
95
85
        # init an existing branch.
96
86
        out, err = self.run_bzr('init subdir2', retcode=3)
97
87
        self.assertEqual('', out)
98
88
        self.failUnless(err.startswith('bzr: ERROR: Already a branch:'))
99
89
 
100
 
    def test_init_branch_quiet(self):
101
 
        out, err = self.run_bzr('init -q')
102
 
        self.assertEqual('', out)
103
 
        self.assertEqual('', err)
104
 
 
105
90
    def test_init_existing_branch(self):
106
91
        self.run_bzr('init')
107
92
        out, err = self.run_bzr('init', retcode=3)
133
118
        except UnicodeError:
134
119
            raise TestSkipped("Unable to create Unicode filename")
135
120
        # try to init unicode dir
136
 
        self.run_bzr(['init', '-q', u'mu-\xb5'])
 
121
        self.run_bzr(['init', u'mu-\xb5'])
137
122
 
138
123
    def create_simple_tree(self):
139
124
        tree = self.make_branch_and_tree('tree')
157
142
    def test_init(self):
158
143
        # init on a remote url should succeed.
159
144
        out, err = self.run_bzr(['init', self.get_url()])
160
 
        self.assertEqual(out,
161
 
            """Created a standalone branch (format: pack-0.92)\n""")
 
145
        self.assertEqual('', out)
162
146
        self.assertEqual('', err)
163
 
 
 
147
    
164
148
    def test_init_existing_branch(self):
165
149
        # when there is already a branch present, make mention
166
150
        self.make_branch('.')