/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_resolve.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_resolve.py
175
175
        """Text conflicts can be resolved automatically"""
176
176
        tree = self.make_branch_and_tree('tree')
177
177
        self.build_tree_contents([('tree/file',
178
 
            '<<<<<<<\na\n=======\n>>>>>>>\n')])
 
178
            b'<<<<<<<\na\n=======\n>>>>>>>\n')])
179
179
        tree.add('file', 'file_id')
180
180
        self.assertEqual(tree.kind('file', 'file_id'), 'file')
181
181
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
184
184
        self.assertContainsRe(note, '0 conflicts auto-resolved.')
185
185
        self.assertContainsRe(note,
186
186
            'Remaining conflicts:\nText conflict in file')
187
 
        self.build_tree_contents([('tree/file', 'a\n')])
 
187
        self.build_tree_contents([('tree/file', b'a\n')])
188
188
        note = self.run_bzr('resolve', working_dir='tree')[1]
189
189
        self.assertContainsRe(note, 'All conflicts resolved.')