← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

  • Committer: Andrew Bennetts
  • Date: 2010-12-14 23:14:44 UTC
  • mfrom: (5569 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5570.
  • Revision ID: andrew.bennetts@canonical.com-20101214231444-uubf7zjbg8q92ocs
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
26
26
from bzrlib.tests import (
27
27
    script,
28
28
    )
29
 
 
30
 
 
31
 
def load_tests(standard_tests, module, loader):
32
 
    """Parameterize tests for view-aware vs not."""
33
 
    to_adapt, result = tests.split_suite_by_condition(
34
 
        standard_tests, tests.condition_isinstance(TestAdd))
 
29
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
30
 
 
31
 
 
32
load_tests = load_tests_apply_scenarios
 
33
 
 
34
 
 
35
class TestAdd(tests.TestCaseWithTransport):
 
36
 
35
37
    scenarios = [
36
38
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
37
39
        ('view-aware', {'branch_tree_format': '2a'}),
38
40
        ]
39
 
    return tests.multiply_tests(to_adapt, scenarios, result)
40
 
 
41
 
 
42
 
class TestAdd(tests.TestCaseWithTransport):
43
41
 
44
42
    def make_branch_and_tree(self, dir):
45
43
        return super(TestAdd, self).make_branch_and_tree(