← Back to branch summary

~jelmer/bzr-search/merge

« back to all changes in this revision

Viewing changes to tests/test_index.py

  • Committer: Robert Collins
  • Date: 2009-03-10 23:10:42 UTC
  • Revision ID: robertc@robertcollins.net-20090310231042-27np6tzqfp9wztxy
Fix for bzr.dev test API changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_index.py
24
24
from bzrlib.plugins import search
25
25
from bzrlib.plugins.search import errors, index
26
26
from bzrlib.tests import (
27
 
    adapt_tests,
28
27
    condition_isinstance,
 
28
    multiply_tests,
29
29
    split_suite_by_condition,
30
30
    TestCaseWithTransport,
31
 
    TestScenarioApplier,
32
31
    )
33
32
 
34
33
 
40
39
            TestComponentCombiner)))
41
40
    graph_suggestion, other_tests = split_suite_by_condition(other_tests,
42
41
        condition_isinstance(TestGraphIndexSuggestions))
43
 
    adapter = TestScenarioApplier()
44
 
    adapter.scenarios = [(format_string[:-1], {'format':format}) for
 
42
    scenarios = [(format_string[:-1], {'format':format}) for
45
43
        format_string, format in index._FORMATS.items()]
46
 
    adapt_tests(component_tests, adapter, other_tests)
47
 
    adapter.scenarios = [
 
44
    multiply_tests(component_tests, scenarios, other_tests)
 
45
    scenarios = [
48
46
        ("GraphIndex", {'format': (InMemoryGraphIndex, index.SuggestableGraphIndex)}),
49
47
        ("BTree", {'format': (BTreeBuilder, index.SuggestableBTreeGraphIndex)})]
50
 
    adapt_tests(graph_suggestion, adapter, other_tests)
 
48
    multiply_tests(graph_suggestion, scenarios, other_tests)
51
49
    return other_tests
52
50
 
53
51