← 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: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
27
27
    )
28
28
from bzrlib.bundle import serializer
29
29
from bzrlib.transport import memory
30
 
 
31
 
 
32
 
def load_tests(standard_tests, module, loader):
33
 
    """Multiply tests for the send command."""
34
 
    result = loader.suiteClass()
35
 
 
36
 
    # one for each king of change
37
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests, tests.condition_isinstance((
39
 
                TestSendStrictWithChanges,
40
 
                )))
41
 
    changes_scenarios = [
42
 
        ('uncommitted',
43
 
         dict(_changes_type='_uncommitted_changes')),
44
 
        ('pending_merges',
45
 
         dict(_changes_type='_pending_merges')),
46
 
        ('out-of-sync-trees',
47
 
         dict(_changes_type='_out_of_sync_trees')),
48
 
        ]
49
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
50
 
    # No parametrization for the remaining tests
51
 
    result.addTests(remaining_tests)
52
 
 
53
 
    return result
 
30
from bzrlib.tests import (
 
31
    scenarios,
 
32
    script,
 
33
    )
 
34
 
 
35
 
 
36
load_tests = scenarios.load_tests_apply_scenarios
54
37
 
55
38
 
56
39
class TestSendMixin(object):
206
189
 
207
190
    def test_note_revisions(self):
208
191
        stderr = self.run_send([])[1]
209
 
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
 
192
        self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
210
193
 
211
194
    def test_mailto_option(self):
212
195
        b = branch.Branch.open('branch')
313
296
    def set_config_send_strict(self, value):
314
297
        # set config var (any of bazaar.conf, locations.conf, branch.conf
315
298
        # should do)
316
 
        conf = self.local_tree.branch.get_config()
317
 
        conf.set_user_option('send_strict', value)
 
299
        conf = self.local_tree.branch.get_config_stack()
 
300
        conf.set('send_strict', value)
318
301
 
319
302
    def assertSendFails(self, args):
320
303
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
328
311
        if revs is None:
329
312
            revs = self._default_sent_revs
330
313
        out, err = self.run_send(args, err_re=err_re)
331
 
        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)
332
318
        if with_warning:
333
319
            self.assertContainsRe(err, self._default_additional_warning)
334
320
            self.assertEndsWith(err, bundling_revs)
366
352
 
367
353
 
368
354
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
369
 
                                   TestSendStrictMixin):
 
355
                                TestSendStrictMixin):
 
356
 
 
357
    # These are textually the same as test_push.strict_push_change_scenarios,
 
358
    # but since the functions are reimplemented here, the definitions are left
 
359
    # here too.
 
360
    scenarios = [
 
361
        ('uncommitted',
 
362
         dict(_changes_type='_uncommitted_changes')),
 
363
        ('pending_merges',
 
364
         dict(_changes_type='_pending_merges')),
 
365
        ('out-of-sync-trees',
 
366
         dict(_changes_type='_out_of_sync_trees')),
 
367
        ]
370
368
 
371
369
    _changes_type = None # Set by load_tests
372
370