← 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: Jonathan Riddell
  • Date: 2011-09-16 15:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153758-y936k3hysjc1tphy
update tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
189
189
 
190
190
    def test_note_revisions(self):
191
191
        stderr = self.run_send([])[1]
192
 
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
 
192
        self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
193
193
 
194
194
    def test_mailto_option(self):
195
195
        b = branch.Branch.open('branch')
311
311
        if revs is None:
312
312
            revs = self._default_sent_revs
313
313
        out, err = self.run_send(args, err_re=err_re)
314
 
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
314
        if len(revs) == 1:
 
315
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
 
316
        else:
 
317
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
315
318
        if with_warning:
316
319
            self.assertContainsRe(err, self._default_additional_warning)
317
320
            self.assertEndsWith(err, bundling_revs)