/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__rio.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-07 05:22:46 UTC
  • mfrom: (4937 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4938.
  • Revision ID: andrew.bennetts@canonical.com-20100107052246-016t0jzmc0j9g7dl
Merge lp:bzr, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
 
24
24
 
25
25
def load_tests(standard_tests, module, loader):
26
 
    # parameterize all tests in this module
27
 
    suite = loader.suiteClass()
28
 
    import bzrlib._rio_py as py_module
29
 
    scenarios = [('python', {'module': py_module})]
30
 
    if compiled_rio_feature.available():
31
 
        scenarios.append(('C', {'module': compiled_rio_feature.module}))
32
 
    else:
33
 
        # the compiled module isn't available, so we add a failing test
34
 
        class FailWithoutFeature(tests.TestCase):
35
 
            def test_fail(self):
36
 
                self.requireFeature(compiled_rio_feature)
37
 
        suite.addTest(loader.loadTestsFromTestCase(FailWithoutFeature))
38
 
    tests.multiply_tests(standard_tests, scenarios, suite)
 
26
    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
 
27
        'bzrlib._rio_py', 'bzrlib._rio_pyx')
39
28
    return suite
40
29
 
41
30
 
42
 
compiled_rio_feature = tests.ModuleAvailableFeature('bzrlib._rio_pyx')
43
 
 
44
 
 
45
31
class TestValidTag(tests.TestCase):
46
32
 
47
33
    module = None # Filled in by test parameterization