Rev 4918: Change CompiledGroupCompressFeature in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

------------------------------------------------------------
revno: 4918
revision-id: john at arbash-meinel.com-20091221180002-xhybnm6qbdqvty56
parent: john at arbash-meinel.com-20091221175117-um04tnqgf4kt591f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Mon 2009-12-21 12:00:02 -0600
message:
  Change CompiledGroupCompressFeature
-------------- next part --------------
=== modified file 'bzrlib/tests/test__groupcompress.py'
--- a/bzrlib/tests/test__groupcompress.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/test__groupcompress.py	2009-12-21 18:00:02 +0000
@@ -32,16 +32,15 @@
     scenarios = [
         ('python', {'_gc_module': _groupcompress_py}),
         ]
-    if CompiledGroupCompressFeature.available():
-        from bzrlib import _groupcompress_pyx
+    if compiled_groupcompress.available():
         scenarios.append(('C',
-            {'_gc_module': _groupcompress_pyx}))
+            {'_gc_module': compiled_groupcompress.module}))
         two_way_scenarios.extend([
-            ('CC', {'make_delta': _groupcompress_pyx.make_delta,
-                    'apply_delta': _groupcompress_pyx.apply_delta}),
+            ('CC', {'make_delta': compiled_groupcompress.module.make_delta,
+                    'apply_delta': compiled_groupcompress.module.apply_delta}),
             ('PC', {'make_delta': _groupcompress_py.make_delta,
-                    'apply_delta': _groupcompress_pyx.apply_delta}),
-            ('CP', {'make_delta': _groupcompress_pyx.make_delta,
+                    'apply_delta': compiled_groupcompress.module.apply_delta}),
+            ('CP', {'make_delta': compiled_groupcompress.module.make_delta,
                     'apply_delta': _groupcompress_py.apply_delta}),
             ])
     to_adapt, result = tests.split_suite_by_condition(
@@ -54,21 +53,8 @@
     return result
 
 
-class _CompiledGroupCompressFeature(tests.Feature):
-
-    def _probe(self):
-        try:
-            import bzrlib._groupcompress_pyx
-        except ImportError:
-            return False
-        else:
-            return True
-
-    def feature_name(self):
-        return 'bzrlib._groupcompress_pyx'
-
-
-CompiledGroupCompressFeature = _CompiledGroupCompressFeature()
+compiled_groupcompress = tests.ModuleAvailableFeature(
+                            'bzrlib._groupcompress_pyx')
 
 _text1 = """\
 This is a bit
@@ -264,9 +250,8 @@
         # This test isn't multiplied, because we only have DeltaIndex for the
         # compiled form
         # We call this here, because _test_needs_features happens after setUp
-        self.requireFeature(CompiledGroupCompressFeature)
-        from bzrlib import _groupcompress_pyx
-        self._gc_module = _groupcompress_pyx
+        self.requireFeature(compiled_groupcompress)
+        self._gc_module = compiled_groupcompress.module
 
     def test_repr(self):
         di = self._gc_module.DeltaIndex('test text\n')

=== modified file 'bzrlib/tests/test_groupcompress.py'
--- a/bzrlib/tests/test_groupcompress.py	2009-10-19 15:06:58 +0000
+++ b/bzrlib/tests/test_groupcompress.py	2009-12-21 18:00:02 +0000
@@ -29,7 +29,7 @@
     versionedfile,
     )
 from bzrlib.osutils import sha_string
-from bzrlib.tests.test__groupcompress import CompiledGroupCompressFeature
+from bzrlib.tests.test__groupcompress import compiled_groupcompress
 
 
 def load_tests(standard_tests, module, loader):
@@ -39,7 +39,7 @@
     scenarios = [
         ('python', {'compressor': groupcompress.PythonGroupCompressor}),
         ]
-    if CompiledGroupCompressFeature.available():
+    if compiled_groupcompress.available():
         scenarios.append(('C',
             {'compressor': groupcompress.PyrexGroupCompressor}))
     return tests.multiply_tests(to_adapt, scenarios, result)
@@ -135,7 +135,7 @@
 
 class TestPyrexGroupCompressor(TestGroupCompressor):
 
-    _test_needs_features = [CompiledGroupCompressFeature]
+    _test_needs_features = [compiled_groupcompress]
     compressor = groupcompress.PyrexGroupCompressor
 
     def test_stats(self):