← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__static_tuple.py

Change all of the compiled_foo to compiled_foo_feature

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__static_tuple.py
36
36
        ('python', {'module': _static_tuple_py}),
37
37
    ]
38
38
    suite = loader.suiteClass()
39
 
    if compiled_static_tuple.available():
40
 
        scenarios.append(('C', {'module': compiled_static_tuple.module}))
 
39
    if compiled_static_tuple_feature.available():
 
40
        scenarios.append(('C', {'module':
 
41
                                compiled_static_tuple_feature.module}))
41
42
    else:
42
43
        # the compiled module isn't available, so we add a failing test
43
44
        class FailWithoutFeature(tests.TestCase):
44
45
            def test_fail(self):
45
 
                self.requireFeature(compiled_static_tuple)
 
46
                self.requireFeature(compiled_static_tuple_feature)
46
47
        suite.addTest(loader.loadTestsFromTestCase(FailWithoutFeature))
47
48
    result = tests.multiply_tests(standard_tests, scenarios, suite)
48
49
    return result
49
50
 
50
51
 
51
 
compiled_static_tuple = tests.ModuleAvailableFeature('bzrlib._static_tuple_c')
 
52
compiled_static_tuple_feature = tests.ModuleAvailableFeature(
 
53
                                    'bzrlib._static_tuple_c')
52
54
 
53
55
 
54
56
class _Meliae(tests.Feature):
628
630
        # Make sure the right implementation is available from
629
631
        # bzrlib.static_tuple.StaticTuple.
630
632
        if self.module is _static_tuple_py:
631
 
            if compiled_static_tuple.available():
 
633
            if compiled_static_tuple_feature.available():
632
634
                # We will be using the C version
633
635
                return
634
636
        self.assertIs(static_tuple.StaticTuple,