← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__simple_set.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__simple_set.py
21
21
from bzrlib import (
22
22
    tests,
23
23
    )
24
 
from bzrlib.tests import (
25
 
    features,
26
 
    )
27
24
 
28
25
try:
29
26
    from bzrlib import _simple_set_pyx
78
75
 
79
76
# Even though this is an extension, we don't permute the tests for a python
80
77
# version. As the plain python version is just a dict or set
81
 
compiled_simpleset_feature = features.ModuleAvailableFeature(
 
78
compiled_simpleset_feature = tests.ModuleAvailableFeature(
82
79
                                'bzrlib._simple_set_pyx')
83
80
 
84
81