/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 breezy/tests/blackbox/test_init.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_init.py
50
50
    def test_init_format_2a(self):
51
51
        """Smoke test for constructing a format 2a repository."""
52
52
        out, err = self.run_bzr('init --format=2a')
53
 
        self.assertEqual(b"""Created a standalone tree (format: 2a)\n""",
 
53
        self.assertEqual("""Created a standalone tree (format: 2a)\n""",
54
54
            out)
55
 
        self.assertEqual(b'', err)
 
55
        self.assertEqual('', err)
56
56
 
57
57
    def test_init_format_bzr(self):
58
58
        """Smoke test for constructing a format with the 'bzr' alias."""
60
60
        self.assertEqual(
61
61
            "Created a standalone tree (format: %s)\n" % self._default_label,
62
62
            out)
63
 
        self.assertEqual(b'', err)
 
63
        self.assertEqual('', err)
64
64
 
65
65
    def test_init_colocated(self):
66
66
        """Smoke test for constructing a colocated branch."""
67
67
        out, err = self.run_bzr('init --format=development-colo file:,branch=abranch')
68
68
        self.assertEqual("""Created a standalone tree (format: development-colo)\n""",
69
69
            out)
70
 
        self.assertEqual(b'', err)
 
70
        self.assertEqual('', err)
71
71
        out, err = self.run_bzr('branches')
72
 
        self.assertEqual(b"  abranch\n", out)
73
 
        self.assertEqual(b'', err)
 
72
        self.assertEqual("  abranch\n", out)
 
73
        self.assertEqual('', err)
74
74
 
75
75
    def test_init_at_repository_root(self):
76
76
        # brz init at the root of a repository should create a branch
87
87
""" % (self._default_label, urlutils.local_path_from_url(
88
88
            repo.controldir.root_transport.external_url())), out)
89
89
        cwd = osutils.getcwd()
90
 
        self.assertEndsWith(out, cwd + b'/repo/\n')
91
 
        self.assertEqual(b'', err)
 
90
        self.assertEndsWith(out, cwd + '/repo/\n')
 
91
        self.assertEqual('', err)
92
92
        newdir.open_branch()
93
93
        newdir.open_workingtree()
94
94
 
95
95
    def test_init_branch(self):
96
96
        out, err = self.run_bzr('init')
97
 
        self.assertEqual(b"Created a standalone tree (format: %s)\n" % (
 
97
        self.assertEqual("Created a standalone tree (format: %s)\n" % (
98
98
            self._default_label,), out)
99
 
        self.assertEqual(b'', err)
 
99
        self.assertEqual('', err)
100
100
 
101
101
        # Can it handle subdirectories of branches too ?
102
102
        out, err = self.run_bzr('init subdir1')
103
 
        self.assertEqual(b"Created a standalone tree (format: %s)\n" % (
 
103
        self.assertEqual("Created a standalone tree (format: %s)\n" % (
104
104
            self._default_label,), out)
105
 
        self.assertEqual(b'', err)
 
105
        self.assertEqual('', err)
106
106
        WorkingTree.open('subdir1')
107
107
 
108
 
        self.run_bzr_error([b'Parent directory of subdir2/nothere does not exist'],
 
108
        self.run_bzr_error(['Parent directory of subdir2/nothere does not exist'],
109
109
                            'init subdir2/nothere')
110
110
        out, err = self.run_bzr('init subdir2/nothere', retcode=3)
111
 
        self.assertEqual(b'', out)
 
111
        self.assertEqual('', out)
112
112
 
113
113
        os.mkdir('subdir2')
114
114
        out, err = self.run_bzr('init subdir2')
115
115
        self.assertEqual("Created a standalone tree (format: %s)\n" % (
116
116
            self._default_label,), out)
117
 
        self.assertEqual(b'', err)
 
117
        self.assertEqual('', err)
118
118
        # init an existing branch.
119
119
        out, err = self.run_bzr('init subdir2', retcode=3)
120
 
        self.assertEqual(b'', out)
 
120
        self.assertEqual('', out)
121
121
        self.assertTrue(err.startswith(b'brz: ERROR: Already a branch:'))
122
122
 
123
123
    def test_init_branch_quiet(self):
124
124
        out, err = self.run_bzr('init -q')
125
 
        self.assertEqual(b'', out)
126
 
        self.assertEqual(b'', err)
 
125
        self.assertEqual('', out)
 
126
        self.assertEqual('', err)
127
127
 
128
128
    def test_init_existing_branch(self):
129
129
        self.run_bzr('init')
130
130
        out, err = self.run_bzr('init', retcode=3)
131
 
        self.assertContainsRe(err, b'Already a branch')
 
131
        self.assertContainsRe(err, 'Already a branch')
132
132
        # don't suggest making a checkout, there's already a working tree
133
 
        self.assertFalse(re.search(br'checkout', err))
 
133
        self.assertFalse(re.search(r'checkout', err))
134
134
 
135
135
    def test_init_existing_without_workingtree(self):
136
136
        # make a repository
169
169
        """'brz init --create-prefix; will create leading directories."""
170
170
        tree = self.create_simple_tree()
171
171
 
172
 
        self.run_bzr_error([b'Parent directory of ../new/tree does not exist'],
 
172
        self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
173
173
                            'init ../new/tree', working_dir='tree')
174
174
        self.run_bzr('init ../new/tree --create-prefix', working_dir='tree')
175
175
        self.assertPathExists('new/tree/.bzr')
188
188
    def test_init_no_tree(self):
189
189
        """'brz init --no-tree' creates a branch with no working tree."""
190
190
        out, err = self.run_bzr('init --no-tree')
191
 
        self.assertStartsWith(out, b'Created a standalone branch')
 
191
        self.assertStartsWith(out, 'Created a standalone branch')
192
192
 
193
193
 
194
194
class TestSFTPInit(TestCaseWithSFTPServer):
197
197
        # init on a remote url should succeed.
198
198
        out, err = self.run_bzr(['init', '--format=pack-0.92', self.get_url()])
199
199
        self.assertEqual(out,
200
 
            b"""Created a standalone branch (format: pack-0.92)\n""")
201
 
        self.assertEqual(b'', err)
 
200
            """Created a standalone branch (format: pack-0.92)\n""")
 
201
        self.assertEqual('', err)
202
202
 
203
203
    def test_init_existing_branch(self):
204
204
        # when there is already a branch present, make mention
205
205
        self.make_branch('.')
206
206
 
207
207
        # rely on SFTPServer get_url() pointing at '.'
208
 
        out, err = self.run_bzr_error([b'Already a branch'],
 
208
        out, err = self.run_bzr_error(['Already a branch'],
209
209
                                      ['init', self.get_url()])
210
210
 
211
211
        # make sure using 'brz checkout' is not suggested
218
218
        self.make_branch_and_tree('.')
219
219
 
220
220
        # rely on SFTPServer get_url() pointing at '.'
221
 
        self.run_bzr_error([b'Already a branch'], ['init', self.get_url()])
 
221
        self.run_bzr_error(['Already a branch'], ['init', self.get_url()])
222
222
 
223
223
    def test_init_append_revisions_only(self):
224
224
        self.run_bzr('init --format=dirstate-tags normal_branch6')
227
227
        self.run_bzr('init --append-revisions-only --format=dirstate-tags branch6')
228
228
        branch = _mod_branch.Branch.open('branch6')
229
229
        self.assertEqual(True, branch.get_append_revisions_only())
230
 
        self.run_bzr_error([b'cannot be set to append-revisions-only'],
 
230
        self.run_bzr_error(['cannot be set to append-revisions-only'],
231
231
                           'init --append-revisions-only --format=knit knit')
232
232
 
233
233
    def test_init_without_username(self):
241
241
        self.overrideEnv('EMAIL', None)
242
242
        self.overrideEnv('BRZ_EMAIL', None)
243
243
        out, err = self.run_bzr(['init', 'foo'])
244
 
        self.assertEqual(err, b'')
 
244
        self.assertEqual(err, '')
245
245
        self.assertTrue(os.path.exists('foo'))
246
246