← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: John Arbash Meinel
  • Date: 2009-05-29 15:06:16 UTC
  • mfrom: (4392 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4460.
  • Revision ID: john@arbash-meinel.com-20090529150616-m29oaesf6ekxr489
Merge bzr.dev, bringing in the gc stacking fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
238
238
        self.run_bzr_error(['Bad value .* for option .format.'],
239
239
                            'send -f branch -o- --format=0.999')[0]
240
240
 
 
241
    def test_format_child_option(self):
 
242
        self.make_trees()
 
243
        parent = _mod_branch.Branch.open('parent')
 
244
        parent.get_config().set_user_option('child_submit_format', '4')
 
245
        s = StringIO(self.run_bzr('send -f branch -o-')[0])
 
246
        md = merge_directive.MergeDirective.from_lines(s.readlines())
 
247
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
 
248
        parent.get_config().set_user_option('child_submit_format', '0.9')
 
249
        s = StringIO(self.run_bzr('send -f branch -o-')[0])
 
250
        md = merge_directive.MergeDirective.from_lines(s.readlines())
 
251
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
 
252
            '# Bazaar revision bundle v0.9')
 
253
        s = StringIO(self.run_bzr('bundle -f branch -o-')[0])
 
254
        md = merge_directive.MergeDirective.from_lines(s.readlines())
 
255
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
 
256
            '# Bazaar revision bundle v0.9')
 
257
        self.assertIs(merge_directive.MergeDirective, md.__class__)
 
258
        parent.get_config().set_user_option('child_submit_format', '0.999')
 
259
        self.run_bzr_error(["No such send format '0.999'"],
 
260
                            'send -f branch -o-')[0]
 
261
 
241
262
    def test_message_option(self):
242
263
        self.make_trees()
243
264
        self.run_bzr('send', retcode=3)