r19704 - /trunk/test_suite/system_tests/frame_order.py -- May 23, 2013 - 18:40

Author: bugman
Date: Thu May 23 18:40:12 2013
New Revision: 19704

URL: http://svn.gna.org/viewcvs/relax?rev=19704&view=rev
Log:
Big speed up of the test suite by skipping a large number of redundant Frame 
Order system tests.

These are tests of using only PCS or only RDC data.  These tests are still 
active for the
pseudo-ellipse just to make sure that a whole missing data type can be 
handled.


Modified:
    trunk/test_suite/system_tests/frame_order.py

Modified: trunk/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=19704&r1=19703&r2=19704&view=diff
==============================================================================
--- trunk/test_suite/system_tests/frame_order.py (original)
+++ trunk/test_suite/system_tests/frame_order.py Thu May 23 18:40:12 2013
@@ -63,15 +63,51 @@
 class Frame_order(SystemTestCase):
     """TestCase class for the functional tests of the frame order 
theories."""
 
-    def __init__(self, methodName='runTest'):
+    def __init__(self, methodName='runTest', skip_tests=True):
         """Skip the tests if scipy is not installed.
 
         @keyword methodName:    The name of the test.
         @type methodName:       str
+        @keyword skip_tests:    A flag which if True will cause a large 
number of redundant tests to be skipped.
+        @type skip_tests:       bool
         """
 
         # Execute the base class method.
         super(Frame_order, self).__init__(methodName)
+
+        # Tests to skip.
+        blacklist = [
+            'test_cam_free_rotor_pcs',
+            'test_cam_free_rotor_rdc',
+            'test_cam_free_rotor2_pcs',
+            'test_cam_free_rotor2_rdc',
+            'test_cam_iso_cone_pcs',
+            'test_cam_iso_cone_rdc',
+            'test_cam_iso_cone_free_rotor_pcs',
+            'test_cam_iso_cone_free_rotor_rdc',
+            'test_cam_iso_cone_free_rotor2_pcs',
+            'test_cam_iso_cone_free_rotor2_rdc',
+            'test_cam_iso_cone_torsionless_pcs',
+            'test_cam_iso_cone_torsionless_rdc',
+            'test_cam_pseudo_ellipse2_pcs',
+            'test_cam_pseudo_ellipse2_rdc',
+            'test_cam_pseudo_ellipse_free_rotor_pcs',
+            'test_cam_pseudo_ellipse_free_rotor_rdc',
+            'test_cam_pseudo_ellipse_torsionless_pcs',
+            'test_cam_pseudo_ellipse_torsionless_rdc',
+            'test_cam_rigid_pcs',
+            'test_cam_rigid_rdc',
+            'test_cam_rotor_pcs',
+            'test_cam_rotor_rdc',
+            'test_cam_rotor_2_state_pcs',
+            'test_cam_rotor_2_state_rdc',
+            'test_cam_rotor2_pcs',
+            'test_cam_rotor2_rdc'
+        ]
+
+        # Skip the blacklisted tests.
+        if skip_tests and methodName in blacklist:
+            status.skipped_tests.append([methodName, None, self._skip_type])
 
         # Missing module.
         if not dep_check.scipy_module: