r20819 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- September 04, 2013 - 19:26

Author: bugman
Date: Wed Sep  4 19:26:35 2013
New Revision: 20819

URL: http://svn.gna.org/viewcvs/relax?rev=20819&view=rev
Log:
The relaxation dispersion system tests requiring the compiled C modules are 
now skipped when not compiled.


Modified:
    branches/relax_disp/test_suite/system_tests/relax_disp.py

Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=20819&r1=20818&r2=20819&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Sep  4 
19:26:35 2013
@@ -28,6 +28,7 @@
 # relax module imports.
 from auto_analyses import relax_disp
 from data_store import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from pipe_control.mol_res_spin import spin_loop
 from specific_analyses.relax_disp.variables import MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LM63, MODEL_M61B, 
MODEL_NOREX, MODEL_R2EFF
 from status import Status; status = Status()
@@ -36,6 +37,29 @@
 
 class Relax_disp(SystemTestCase):
     """Class for testing various aspects specific to relaxation dispersion 
curve-fitting."""
+
+    def __init__(self, methodName='runTest'):
+        """Skip certain tests if the C modules are non-functional.
+
+        @keyword methodName:    The name of the test.
+        @type methodName:       str
+        """
+
+        # Execute the base class method.
+        super(Relax_disp, self).__init__(methodName)
+
+        # Missing module.
+        if not dep_check.C_module_exp_fn:
+            # The list of tests to skip.
+            to_skip = [
+                "test_exp_fit",
+                "test_m61_exp_data_to_m61"
+            ]
+
+            # Store in the status object. 
+            if methodName in to_skip:
+                status.skipped_tests.append([methodName, 'Relax 
curve-fitting C module', self._skip_type])
+
 
     def setUp(self):
         """Set up for all the functional tests."""