~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

• browse files at revision 6341.1.4
• compare with another revision
• download diff
• download tarball
• view history from revision 6341.1.4

• reverse the comparison (6341.1.4 to 5200.1.2)
• stop comparing with revision 5200.1.2

Show diffs side-by-side

added

removed

bzrlib/tests/per_merger.py

1

 

# Copyright (C) 2009, 2010 Canonical Ltd

 

1

# Copyright (C) 2009, 2010, 2011 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

22

22

from bzrlib import (

23

23

    errors,

24

24

    merge as _mod_merge,

25

 

    option,

26

 

    progress,

27

25

    )

28

26

from bzrlib.tests import (

29

27

    multiply_tests,

39

37

    result = loader.suiteClass()

40

38

    scenarios = [

41

39

        (name, {'merge_type': merger})

42

 

        for name, merger in option._merge_type_registry.items()]

 

40

        for name, merger in _mod_merge.merge_type_registry.items()]

43

41

    return multiply_tests(standard_tests, scenarios, result)

44

42

 

45

43

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1