← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
22
22
from bzrlib import (
23
23
    errors,
24
24
    merge as _mod_merge,
25
 
    option,
26
25
    )
27
26
from bzrlib.tests import (
28
27
    multiply_tests,
38
37
    result = loader.suiteClass()
39
38
    scenarios = [
40
39
        (name, {'merge_type': merger})
41
 
        for name, merger in option._merge_type_registry.items()]
 
40
        for name, merger in _mod_merge.merge_type_registry.items()]
42
41
    return multiply_tests(standard_tests, scenarios, result)
43
42
 
44
43