← 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 Pool
  • Date: 2010-12-09 04:26:53 UTC
  • mto: This revision was merged to the branch mainline in revision 5564.
  • Revision ID: mbp@canonical.com-20101209042653-hgy6vkrlfvi1d7rs
Change to using standard load_tests_apply_scenarios.

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
 
 
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.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
54
34
 
55
35
 
56
36
class TestSendMixin(object):
368
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
369
349
                                   TestSendStrictMixin):
370
350
 
 
351
    # These are textually the same as test_push.strict_push_change_scenarios,
 
352
    # but since the functions are reimplemented here, the definitions are left
 
353
    # here too.
 
354
    scenarios = [
 
355
        ('uncommitted',
 
356
         dict(_changes_type='_uncommitted_changes')),
 
357
        ('pending_merges',
 
358
         dict(_changes_type='_pending_merges')),
 
359
        ('out-of-sync-trees',
 
360
         dict(_changes_type='_out_of_sync_trees')),
 
361
        ]
 
362
 
371
363
    _changes_type = None # Set by load_tests
372
364
 
373
365
    def setUp(self):