← 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

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
27
27
    )
28
28
from bzrlib.bundle import serializer
29
29
from bzrlib.transport import memory
30
 
from bzrlib.tests import (
31
 
    scenarios,
32
 
    script,
33
 
    )
34
 
 
35
 
 
36
 
load_tests = scenarios.load_tests_apply_scenarios
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
37
34
 
38
35
 
39
36
class TestSendMixin(object):
189
186
 
190
187
    def test_note_revisions(self):
191
188
        stderr = self.run_send([])[1]
192
 
        self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
 
189
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
193
190
 
194
191
    def test_mailto_option(self):
195
192
        b = branch.Branch.open('branch')
296
293
    def set_config_send_strict(self, value):
297
294
        # set config var (any of bazaar.conf, locations.conf, branch.conf
298
295
        # should do)
299
 
        conf = self.local_tree.branch.get_config_stack()
300
 
        conf.set('send_strict', value)
 
296
        conf = self.local_tree.branch.get_config()
 
297
        conf.set_user_option('send_strict', value)
301
298
 
302
299
    def assertSendFails(self, args):
303
300
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
311
308
        if revs is None:
312
309
            revs = self._default_sent_revs
313
310
        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)
 
311
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
318
312
        if with_warning:
319
313
            self.assertContainsRe(err, self._default_additional_warning)
320
314
            self.assertEndsWith(err, bundling_revs)
352
346
 
353
347
 
354
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
355
 
                                TestSendStrictMixin):
 
349
                                   TestSendStrictMixin):
356
350
 
357
351
    # These are textually the same as test_push.strict_push_change_scenarios,
358
352
    # but since the functions are reimplemented here, the definitions are left