/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_missing.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_missing.py
38
38
        # XXX: This still needs a test that missing is quiet when there are
39
39
        # missing revisions.
40
40
        a_tree = self.make_branch_and_tree('.')
41
 
        self.build_tree_contents([('a', 'initial\n')])
 
41
        self.build_tree_contents([('a', b'initial\n')])
42
42
        a_tree.add('a')
43
43
        a_tree.commit(message='initial')
44
44
 
52
52
 
53
53
        # create a source branch
54
54
        a_tree = self.make_branch_and_tree('a')
55
 
        self.build_tree_contents([('a/a', 'initial\n')])
 
55
        self.build_tree_contents([('a/a', b'initial\n')])
56
56
        a_tree.add('a')
57
57
        a_tree.commit(message='initial')
58
58
 
59
59
        # clone and add a differing revision
60
60
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
61
 
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
 
61
        self.build_tree_contents([('b/a', b'initial\nmore\n')])
62
62
        b_tree.commit(message='more')
63
63
 
64
64
        def run_missing(args, retcode=1, working_dir=None):
160
160
    def test_missing_filtered(self):
161
161
        # create a source branch
162
162
        a_tree = self.make_branch_and_tree('a')
163
 
        self.build_tree_contents([('a/a', 'initial\n')])
 
163
        self.build_tree_contents([('a/a', b'initial\n')])
164
164
        a_tree.add('a')
165
165
        a_tree.commit(message='r1')
166
166
        # clone and add differing revisions
221
221
 
222
222
        # create a source branch
223
223
        a_tree = self.make_branch_and_tree('a')
224
 
        self.build_tree_contents([('a/a', 'initial\n')])
 
224
        self.build_tree_contents([('a/a', b'initial\n')])
225
225
        a_tree.add('a')
226
226
        a_tree.commit(message='initial')
227
227
 
228
228
        # clone and add a differing revision
229
229
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
230
 
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
 
230
        self.build_tree_contents([('b/a', b'initial\nmore\n')])
231
231
        b_tree.commit(message='more')
232
232
 
233
233
        out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
240
240
 
241
241
        # create a source branch
242
242
        a_tree = self.make_branch_and_tree('a')
243
 
        self.build_tree_contents([('a/a', 'initial\n')])
 
243
        self.build_tree_contents([('a/a', b'initial\n')])
244
244
        a_tree.add('a')
245
245
        a_tree.commit(message='initial')
246
246
 
247
247
        # clone and add a differing revision
248
248
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
249
 
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
 
249
        self.build_tree_contents([('b/a', b'initial\nmore\n')])
250
250
        b_tree.commit(message='more')
251
251
        b_tree.branch.tags.set_tag('a-tag', b_tree.last_revision())
252
252