← 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: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

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,
25
26
    )
26
27
from bzrlib.tests import (
27
28
    multiply_tests,
37
38
    result = loader.suiteClass()
38
39
    scenarios = [
39
40
        (name, {'merge_type': merger})
40
 
        for name, merger in _mod_merge.merge_type_registry.items()]
 
41
        for name, merger in option._merge_type_registry.items()]
41
42
    return multiply_tests(standard_tests, scenarios, result)
42
43
 
43
44