/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: Jelmer Vernooij
  • Date: 2017-11-16 00:39:04 UTC
  • mto: This revision was merged to the branch mainline in revision 6818.
  • Revision ID: jelmer@jelmer.uk-20171116003904-p6lcb827m6thxbzd
Migrate some build_snapshot code over to having revision_id as keyword argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_dpush.py
44
44
    def make_dummy_builder(self, relpath):
45
45
        builder = self.make_branch_builder(
46
46
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
47
 
        builder.build_snapshot('revid', None,
 
47
        builder.build_snapshot(None,
48
48
            [('add', ('', 'TREE_ROOT', 'directory', None)),
49
 
             ('add', ('foo', 'fooid', 'file', 'bar'))])
 
49
             ('add', ('foo', 'fooid', 'file', 'bar'))],
 
50
            revision_id='revid')
50
51
        return builder
51
52
 
52
53
    def test_dpush_native(self):
128
129
        self.build_tree_contents([("dc/foo", "bar")])
129
130
        dc_tree.commit('msg1')
130
131
 
131
 
        builder.build_snapshot('revid2', None,
132
 
          [('modify', ('fooid', 'blie'))])
 
132
        builder.build_snapshot(None,
 
133
          [('modify', ('fooid', 'blie'))], revision_id='revid2')
133
134
 
134
135
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
135
136
        self.assertEqual(output, "")