← 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: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
https://launchpad.net/bugs/1565503
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

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
 
210
209
    """Tests that the 'merge_file_content' hook is invoked."""
211
210
 
212
211
    def setUp(self):
213
 
        TestCaseWithTransport.setUp(self)
 
212
        super(TestHookMergeFileContent, self).setUp()
214
213
        self.hook_log = []
215
214
 
216
215
    def install_hook_inactive(self):