Rev 4938: Handle the fact that osutils requires the feature to be available. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension

John Arbash Meinel john at arbash-meinel.com
Tue Dec 22 17:14:58 GMT 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-permute-for-extension

------------------------------------------------------------
revno: 4938
revision-id: john at arbash-meinel.com-20091222171445-fm7lcwhmkfdkc01q
parent: john at arbash-meinel.com-20091222171118-eh9bthlxka07rhcz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-permute-for-extension
timestamp: Tue 2009-12-22 11:14:45 -0600
message:
  Handle the fact that osutils requires the feature to be available.
-------------- next part --------------
=== modified file 'bzrlib/tests/test__chunks_to_lines.py'
--- a/bzrlib/tests/test__chunks_to_lines.py	2009-12-22 16:28:47 +0000
+++ b/bzrlib/tests/test__chunks_to_lines.py	2009-12-22 17:14:45 +0000
@@ -21,10 +21,17 @@
 
 
 def load_tests(standard_tests, module, loader):
-    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
-        'bzrlib._chunks_to_lines_py', 'bzrlib._chunks_to_lines_pyx')
+    suite, _ = tests.permute_tests_for_extension(
+        standard_tests, loader, 'bzrlib._chunks_to_lines_py',
+        'bzrlib._chunks_to_lines_pyx')
     return suite
 
+# test_osutils depends on this feature being around. We can't just use the one
+# generated by load_tests, because if we only load osutils but not this module,
+# then that code never gets run
+compiled_chunkstolines_feature = tests.ModuleAvailableFeature(
+                                    'bzrlib._chunks_to_lines_pyx')
+
 
 class TestChunksToLines(tests.TestCase):
 



More information about the bazaar-commits mailing list