← 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: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

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.\n')
 
192
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
193
193
 
194
194
    def test_mailto_option(self):
195
195
        b = branch.Branch.open('branch')
296
296
    def set_config_send_strict(self, value):
297
297
        # set config var (any of bazaar.conf, locations.conf, branch.conf
298
298
        # should do)
299
 
        conf = self.local_tree.branch.get_config_stack()
300
 
        conf.set('send_strict', value)
 
299
        conf = self.local_tree.branch.get_config()
 
300
        conf.set_user_option('send_strict', value)
301
301
 
302
302
    def assertSendFails(self, args):
303
303
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
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
 
        if len(revs) == 1:
315
 
            bundling_revs = 'Bundling %d revision.\n'% len(revs)
316
 
        else:
317
 
            bundling_revs = 'Bundling %d revisions.\n' % len(revs)
 
314
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
318
315
        if with_warning:
319
316
            self.assertContainsRe(err, self._default_additional_warning)
320
317
            self.assertEndsWith(err, bundling_revs)