/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_status.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_status.py
491
491
    def test_status_out_of_date(self):
492
492
        """Simulate status of out-of-date tree after remote push"""
493
493
        tree = self.make_branch_and_tree('.')
494
 
        self.build_tree_contents([('a', 'foo\n')])
 
494
        self.build_tree_contents([('a', b'foo\n')])
495
495
        tree.lock_write()
496
496
        try:
497
497
            tree.add(['a'])
753
753
    def test_pending_specific_files(self):
754
754
        """With a specific file list, pending merges are not shown."""
755
755
        tree = self.make_branch_and_tree('tree')
756
 
        self.build_tree_contents([('tree/a', 'content of a\n')])
 
756
        self.build_tree_contents([('tree/a', b'content of a\n')])
757
757
        tree.add('a')
758
758
        r1_id = tree.commit('one')
759
759
        alt = tree.controldir.sprout('alt').open_workingtree()
760
 
        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
 
760
        self.build_tree_contents([('alt/a', b'content of a\nfrom alt\n')])
761
761
        alt_id = alt.commit('alt')
762
762
        tree.merge_from_branch(alt.branch)
763
763
        output = self.make_utf8_encoded_stringio()
774
774
        working_tree = self.make_branch_and_tree(u'.')
775
775
        filename = u'hell\u00d8'
776
776
        try:
777
 
            self.build_tree_contents([(filename, 'contents of hello')])
 
777
            self.build_tree_contents([(filename, b'contents of hello')])
778
778
        except UnicodeEncodeError:
779
779
            raise TestSkipped("can't build unicode working tree in "
780
780
                "filesystem encoding %s" % sys.getfilesystemencoding())