/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_merge_directive.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge_directive.py
43
43
 
44
44
    def prepare_merge_directive(self):
45
45
        self.tree1 = self.make_branch_and_tree('tree1')
46
 
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
 
46
        self.build_tree_contents([('tree1/file', b'a\nb\nc\nd\n')])
47
47
        self.tree1.branch.get_config_stack().set(
48
48
            'email', 'J. Random Hacker <jrandom@example.com>')
49
49
        self.tree1.add('file')
50
 
        self.tree1.commit('foo', rev_id='foo-id')
 
50
        self.tree1.commit('foo', rev_id=b'foo-id')
51
51
        self.tree2 = self.tree1.controldir.sprout('tree2').open_workingtree()
52
 
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\ne\n')])
53
 
        self.tree1.commit('bar', rev_id='bar-id')
 
52
        self.build_tree_contents([('tree1/file', b'a\nb\nc\nd\ne\n')])
 
53
        self.tree1.commit('bar', rev_id=b'bar-id')
54
54
        os.chdir('tree1')
55
55
        return self.tree1, self.tree2
56
56
 
155
155
 
156
156
    def test_pull_raw(self):
157
157
        self.prepare_merge_directive()
158
 
        self.tree1.commit('baz', rev_id='baz-id')
 
158
        self.tree1.commit('baz', rev_id=b'baz-id')
159
159
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
160
160
                                '-r', '2', self.tree1.basedir, '--plain'])[0]
161
161
        self.build_tree_contents([('../directive', md_text)])
167
167
    def test_pull_user_r(self):
168
168
        """If the user supplies -r, an error is emitted"""
169
169
        self.prepare_merge_directive()
170
 
        self.tree1.commit('baz', rev_id='baz-id')
 
170
        self.tree1.commit('baz', rev_id=b'baz-id')
171
171
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
172
172
                                self.tree1.basedir, '--plain'])[0]
173
173
        self.build_tree_contents([('../directive', md_text)])
178
178
 
179
179
    def test_pull_bundle(self):
180
180
        self.prepare_merge_directive()
181
 
        self.tree1.commit('baz', rev_id='baz-id')
 
181
        self.tree1.commit('baz', rev_id=b'baz-id')
182
182
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
183
183
                                '-r', '2', '/dev/null', '--bundle'])[0]
184
184
        self.build_tree_contents([('../directive', md_text)])
189
189
 
190
190
    def test_merge_raw(self):
191
191
        self.prepare_merge_directive()
192
 
        self.tree1.commit('baz', rev_id='baz-id')
 
192
        self.tree1.commit('baz', rev_id=b'baz-id')
193
193
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
194
194
                                '-r', '2', self.tree1.basedir, '--plain'])[0]
195
195
        self.build_tree_contents([('../directive', md_text)])
201
201
    def test_merge_user_r(self):
202
202
        """If the user supplies -r, an error is emitted"""
203
203
        self.prepare_merge_directive()
204
 
        self.tree1.commit('baz', rev_id='baz-id')
 
204
        self.tree1.commit('baz', rev_id=b'baz-id')
205
205
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
206
206
                                self.tree1.basedir, '--plain'])[0]
207
207
        self.build_tree_contents([('../directive', md_text)])
212
212
 
213
213
    def test_merge_bundle(self):
214
214
        self.prepare_merge_directive()
215
 
        self.tree1.commit('baz', rev_id='baz-id')
 
215
        self.tree1.commit('baz', rev_id=b'baz-id')
216
216
        md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
217
217
                               '-r', '2', '/dev/null', '--bundle'])[0]
218
218
        self.build_tree_contents([('../directive', md_text)])