r12148 - /1.3/test_suite/system_tests/frame_order.py -- January 04, 2011 - 14:49

Author: bugman
Date: Tue Jan  4 14:49:06 2011
New Revision: 12148

URL: http://svn.gna.org/viewcvs/relax?rev=12148&view=rev
Log:
The frame order system tests are being skipped if scipy is not installed.


Modified:
    1.3/test_suite/system_tests/frame_order.py

Modified: 1.3/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/frame_order.py?rev=12148&r1=12147&r2=12148&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/frame_order.py (original)
+++ 1.3/test_suite/system_tests/frame_order.py Tue Jan  4 14:49:06 2011
@@ -31,6 +31,7 @@
 # relax module imports.
 from base_classes import SystemTestCase
 from data import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from physical_constants import N15_CSA, NH_BOND_LENGTH
 from relax_io import DummyFileObject, open_read_file
 from status import Status; status = Status()
@@ -58,6 +59,23 @@
 
 class Frame_order(SystemTestCase):
     """TestCase class for the functional tests of the frame order 
theories."""
+
+    def __init__(self, methodName='runTest'):
+        """Skip the tests if scipy is not installed.
+
+        @keyword methodName:    The name of the test.
+        @type methodName:       str
+        """
+
+        # Missing module.
+        if not dep_check.scipy_module:
+            # Store in the status object. 
+            status.skipped_tests.append([methodName, 'Scipy', 'system'])
+
+        # Execute the base class method.
+        super(Test_scientific, self).__init__(methodName)
+
+
 
     def setUp(self):
         """Set up for all the functional tests."""