r18224 - /trunk/test_suite/system_tests/pipes.py -- January 18, 2013 - 14:19

Author: bugman
Date: Fri Jan 18 14:19:34 2013
New Revision: 18224

URL: http://svn.gna.org/viewcvs/relax?rev=18224&view=rev
Log:
The Pipes.test_change_type system test is skipped if the required scipy 
module is not installed.


Modified:
    trunk/test_suite/system_tests/pipes.py

Modified: trunk/test_suite/system_tests/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/pipes.py?rev=18224&r1=18223&r2=18224&view=diff
==============================================================================
--- trunk/test_suite/system_tests/pipes.py (original)
+++ trunk/test_suite/system_tests/pipes.py Fri Jan 18 14:19:34 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -24,6 +24,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from generic_fns import pipes
 from status import Status; status = Status()
 from test_suite.system_tests.base_classes import SystemTestCase
@@ -31,6 +32,22 @@
 
 class Pipes(SystemTestCase):
     """TestCase class for the functional tests of relax data pipes."""
+
+    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(Pipes, self).__init__(methodName)
+
+        # Missing module.
+        if not dep_check.scipy_module and methodName in ['test_change_type']:
+            # Store in the status object. 
+            status.skipped_tests.append([methodName, 'Scipy', 
self._skip_type])
+
 
     def test_change_type(self):
         """Test the pipe.change_type user function."""