/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-01-27 05:04:43 UTC
  • mfrom: (3960 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3981.
  • Revision ID: andrew.bennetts@canonical.com-20090127050443-3yw5hhk10ss23hzu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
 
25
    urlutils,
25
26
    )
26
27
from bzrlib.bzrdir import BzrDirMetaFormat1
27
28
from bzrlib.tests import TestSkipped
44
45
        # --format=weave should be accepted to allow interoperation with
45
46
        # old releases when desired.
46
47
        out, err = self.run_bzr('init --format=weave')
47
 
        self.assertEqual("""Standalone tree (format: weave)
48
 
Location:
49
 
  branch root: .
50
 
""", out)
 
48
        self.assertEqual("""Created a standalone tree (format: weave)\n""",
 
49
            out)
51
50
        self.assertEqual('', err)
52
51
 
53
52
    def test_init_at_repository_root(self):
60
59
        repo = newdir.create_repository(shared=True)
61
60
        repo.set_make_working_trees(False)
62
61
        out, err = self.run_bzr('init repo')
63
 
        self.assertEqual(
64
 
"""Repository tree (format: pack-0.92)
65
 
Location:
66
 
  shared repository: repo
67
 
  repository branch: repo
68
 
""", out)
 
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")
69
68
        self.assertEqual('', err)
70
69
        newdir.open_branch()
71
70
        newdir.open_workingtree()
72
 
        
 
71
 
73
72
    def test_init_branch(self):
74
73
        out, err = self.run_bzr('init')
75
 
        self.assertEqual(
76
 
"""Standalone tree (format: pack-0.92)
77
 
Location:
78
 
  branch root: .
79
 
""", out)
 
74
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
 
75
            out)
80
76
        self.assertEqual('', err)
81
77
 
82
78
        # Can it handle subdirectories of branches too ?
83
79
        out, err = self.run_bzr('init subdir1')
84
 
        self.assertEqual(
85
 
"""Standalone tree (format: pack-0.92)
86
 
Location:
87
 
  branch root: subdir1
88
 
""", out)
 
80
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
 
81
            out)
89
82
        self.assertEqual('', err)
90
83
        WorkingTree.open('subdir1')
91
84
        
96
89
        
97
90
        os.mkdir('subdir2')
98
91
        out, err = self.run_bzr('init subdir2')
99
 
        self.assertEqual("""Standalone tree (format: pack-0.92)
100
 
Location:
101
 
  branch root: subdir2
102
 
""", out)
 
92
        self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
 
93
            out)
103
94
        self.assertEqual('', err)
104
95
        # init an existing branch.
105
96
        out, err = self.run_bzr('init subdir2', retcode=3)
166
157
    def test_init(self):
167
158
        # init on a remote url should succeed.
168
159
        out, err = self.run_bzr(['init', self.get_url()])
169
 
        self.assertStartsWith(out, """Standalone branch (format: pack-0.92)
170
 
Location:
171
 
  branch root: """)
 
160
        self.assertEqual(out,
 
161
            """Created a standalone branch (format: pack-0.92)\n""")
172
162
        self.assertEqual('', err)
173
 
    
 
163
 
174
164
    def test_init_existing_branch(self):
175
165
        # when there is already a branch present, make mention
176
166
        self.make_branch('.')