r18241 - /branches/frame_order_testing/test_suite/system_tests/n_state_model.py -- January 18, 2013 - 22:52

Author: bugman
Date: Fri Jan 18 22:52:45 2013
New Revision: 18241

URL: http://svn.gna.org/viewcvs/relax?rev=18241&view=rev
Log:
The N_state_model.test_frame_order_align_fit system test is now skipped if 
the scipy module is not installed.


Modified:
    branches/frame_order_testing/test_suite/system_tests/n_state_model.py

Modified: 
branches/frame_order_testing/test_suite/system_tests/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/n_state_model.py?rev=18241&r1=18240&r2=18241&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/n_state_model.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/n_state_model.py Fri 
Jan 18 22:52:45 2013
@@ -28,6 +28,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from generic_fns.align_tensor import calc_chi_tensor
 from generic_fns.interatomic import interatomic_loop, return_interatom
 from generic_fns.mol_res_spin import return_spin, spin_index_loop, spin_loop
@@ -38,6 +39,22 @@
 
 class N_state_model(SystemTestCase):
     """Class for testing various aspects specific to the N-state model."""
+
+    def __init__(self, methodName='runTest'):
+        """Skip some tests if scipy is not installed.
+
+        @keyword methodName:    The name of the test.
+        @type methodName:       str
+        """
+
+        # Execute the base class method.
+        super(N_state_model, self).__init__(methodName)
+
+        # Missing module.
+        if not dep_check.scipy_module and methodName == 
'test_frame_order_align_fit':
+            # Store in the status object. 
+            status.skipped_tests.append([methodName, 'Scipy', 
self._skip_type])
+
 
     def check_vectors(self):
         """Auxiliary method for checking the correct loading of bond 
vectors."""