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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 00:09:22 UTC
  • mfrom: (6855.3.4 bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325000922-me9zmwqekxft9d91
Add more bees in places, get more tests to pass on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/bees/+merge/337908

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
611
611
        self.tree1 = self.make_branch_and_tree('b1')
612
612
        self.b1 = self.tree1.branch
613
613
 
614
 
        self.build_tree_contents([('b1/one', 'one\n')])
 
614
        self.build_tree_contents([('b1/one', b'one\n')])
615
615
        self.tree1.add('one', 'one-id')
616
616
        self.tree1.set_root_id('root-id')
617
617
        self.tree1.commit('add one', rev_id='a@cset-0-1')
630
630
                , 'b1/sub/sub/'
631
631
                , 'b1/sub/sub/nonempty.txt'
632
632
                ])
633
 
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
634
 
                                  ('b1/dir/nolastnewline.txt', 'bloop')])
 
633
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
 
634
                                  ('b1/dir/nolastnewline.txt', b'bloop')])
635
635
        tt = TreeTransform(self.tree1)
636
636
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
637
637
        tt.apply()
1055
1055
    def test_bundle_with_ghosts(self):
1056
1056
        tree = self.make_branch_and_tree('tree')
1057
1057
        self.b1 = tree.branch
1058
 
        self.build_tree_contents([('tree/file', 'content1')])
 
1058
        self.build_tree_contents([('tree/file', b'content1')])
1059
1059
        tree.add(['file'])
1060
1060
        tree.commit('rev1')
1061
 
        self.build_tree_contents([('tree/file', 'content2')])
1062
 
        tree.add_parent_tree_id('ghost')
1063
 
        tree.commit('rev2', rev_id='rev2')
1064
 
        bundle = self.get_valid_bundle('null:', 'rev2')
 
1061
        self.build_tree_contents([('tree/file', b'content2')])
 
1062
        tree.add_parent_tree_id(b'ghost')
 
1063
        tree.commit('rev2', rev_id=b'rev2')
 
1064
        bundle = self.get_valid_bundle(b'null:', b'rev2')
1065
1065
 
1066
1066
    def make_simple_tree(self, format=None):
1067
1067
        tree = self.make_branch_and_tree('b1', format=format)