/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/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/test_merge_directive.py
570
570
    def test_use_submit_for_missing_dependency(self):
571
571
        tree_a, tree_b, branch_c = self.make_trees()
572
572
        branch_c.pull(tree_a.branch)
573
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
 
573
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
574
574
        tree_a.commit('rev3a', rev_id=b'rev3a')
575
575
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
576
576
            branch_c.base, base_revision_id=b'rev2a')
579
579
    def test_handle_target_not_a_branch(self):
580
580
        tree_a, tree_b, branch_c = self.make_trees()
581
581
        branch_c.pull(tree_a.branch)
582
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
 
582
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
583
583
        tree_a.commit('rev3a', rev_id=b'rev3a')
584
584
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
585
585
            branch_c.base, base_revision_id=b'rev2a')