~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_btree_index.py

  • Committer: Aaron Bentley
  • Date: 2009-06-26 03:44:30 UTC
  • mfrom: (4481 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4482.
  • Revision ID: aaron@aaronbentley.com-20090626034430-5btbqa44ikywccsu
Merge bzr.dev into vpipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
    if CompiledBtreeParserFeature.available():
44
44
        # Is there a way to do this that gets missing feature failures rather
45
45
        # than no indication to the user?
46
 
        import bzrlib._btree_serializer_c as c_module
 
46
        import bzrlib._btree_serializer_pyx as c_module
47
47
        scenarios.append(('C', {'parse_btree': c_module}))
48
48
    return multiply_tests(node_tests, scenarios, others)
49
49
 
51
51
class _CompiledBtreeParserFeature(tests.Feature):
52
52
    def _probe(self):
53
53
        try:
54
 
            import bzrlib._btree_serializer_c
 
54
            import bzrlib._btree_serializer_pyx
55
55
        except ImportError:
56
56
            return False
57
57
        return True
58
58
 
59
59
    def feature_name(self):
60
 
        return 'bzrlib._btree_serializer_c'
 
60
        return 'bzrlib._btree_serializer_pyx'
61
61
 
62
62
CompiledBtreeParserFeature = _CompiledBtreeParserFeature()
63
63