/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_dpush.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_dpush.py
47
47
        builder.build_snapshot(None,
48
48
            [('add', ('', 'TREE_ROOT', 'directory', None)),
49
49
             ('add', ('foo', 'fooid', 'file', 'bar'))],
50
 
            revision_id='revid')
 
50
            revision_id=b'revid')
51
51
        return builder
52
52
 
53
53
    def test_dpush_native(self):
78
78
        b = self.make_dummy_builder('d').get_branch()
79
79
 
80
80
        dc = b.controldir.sprout('dc', force_new_repo=True)
81
 
        self.build_tree_contents([("dc/foofile", "blaaaa")])
 
81
        self.build_tree_contents([("dc/foofile", b"blaaaa")])
82
82
        dc_tree = dc.open_workingtree()
83
83
        dc_tree.add("foofile")
84
84
        dc_tree.commit("msg")
97
97
        b = self.make_dummy_builder('d').get_branch()
98
98
 
99
99
        dc = b.controldir.sprout('dc', force_new_repo=True)
100
 
        self.build_tree_contents([("dc/foofile", "blaaaa")])
 
100
        self.build_tree_contents([("dc/foofile", b"blaaaa")])
101
101
        dc_tree = dc.open_workingtree()
102
102
        dc_tree.add("foofile")
103
103
        newrevid = dc_tree.commit('msg')
104
104
 
105
 
        self.build_tree_contents([("dc/foofile", "blaaaal")])
 
105
        self.build_tree_contents([("dc/foofile", b"blaaaal")])
106
106
        script.run_script(self, '''
107
107
            $ brz dpush -d dc d --no-strict
108
108
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
126
126
        dc = b.controldir.sprout('dc', force_new_repo=True)
127
127
        dc_tree = dc.open_workingtree()
128
128
 
129
 
        self.build_tree_contents([("dc/foo", "bar")])
 
129
        self.build_tree_contents([("dc/foo", b"bar")])
130
130
        dc_tree.commit('msg1')
131
131
 
132
132
        builder.build_snapshot(None,
133
 
          [('modify', ('fooid', 'blie'))], revision_id='revid2')
 
133
          [('modify', (b'fooid', 'blie'))], revision_id=b'revid2')
134
134
 
135
135
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
136
136
        self.assertEqual(output, "")