r12151 - /1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py -- January 04, 2011 - 14:58

Author: bugman
Date: Tue Jan  4 14:58:19 2011
New Revision: 12151

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


Modified:
    1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py

Modified: 1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py?rev=12151&r1=12150&r2=12151&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py 
(original)
+++ 1.3/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py Tue 
Jan  4 14:58:19 2011
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2010 Edward d'Auvergne                                       
 #
+# Copyright (C) 2010-2011 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -36,6 +36,22 @@
 class Test_frame_order_matrix_ops(TestCase):
     """Unit tests for the maths_fns.frame_order_matrix_ops relax module."""
 
+    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', 'unit'])
+
+        # Execute the base class method.
+        super(Test_frame_order_matrix_ops, self).__init__(methodName)
+
+
     def setUp(self):
         """Initialise a few data structures for the tests."""