← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__groupcompress.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__groupcompress.py
23
23
from bzrlib.tests.scenarios import (
24
24
    load_tests_apply_scenarios,
25
25
    )
26
 
from bzrlib.tests import (
27
 
    features,
28
 
    )
29
26
 
30
27
 
31
28
def module_scenarios():
60
57
load_tests = load_tests_apply_scenarios
61
58
 
62
59
 
63
 
compiled_groupcompress_feature = features.ModuleAvailableFeature(
64
 
    'bzrlib._groupcompress_pyx')
 
60
compiled_groupcompress_feature = tests.ModuleAvailableFeature(
 
61
                                    'bzrlib._groupcompress_pyx')
65
62
 
66
63
_text1 = """\
67
64
This is a bit