r15268 - /branches/frame_order_testing/test_suite/system_tests/frame_order.py -- January 27, 2012 - 09:51

Author: bugman
Date: Fri Jan 27 09:51:10 2012
New Revision: 15268

URL: http://svn.gna.org/viewcvs/relax?rev=15268&view=rev
Log:
The data and optimisation flags are now setup in the setUp() method.


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

Modified: branches/frame_order_testing/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/frame_order.py?rev=15268&r1=15267&r2=15268&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/frame_order.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/frame_order.py Fri 
Jan 27 09:51:10 2012
@@ -86,6 +86,11 @@
         # Create the data pipe.
         self.interpreter.pipe.create('test', 'frame order')
 
+        # Set a number of flags for the scripts.
+        ds.flag_rdc = True
+        ds.flag_pcs = True
+        ds.flag_opt = False
+
 
     def mesg_opt_debug(self):
         """Method for returning a string to help debug the minimisation.
@@ -171,11 +176,6 @@
     def test_cam_free_rotor(self):
         """Test the free rotor frame order model of CaM."""
 
-        # Setup.
-        ds.flag_rdc = True
-        ds.flag_pcs = True
-        ds.flag_opt = False
-
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
@@ -192,12 +192,8 @@
     def test_cam_free_rotor_no_rdc(self):
         """Test the free rotor frame order model of CaM."""
 
-        # Setup.
+        # Execute the script.
         ds.flag_rdc = False
-        ds.flag_pcs = True
-        ds.flag_opt = False
-
-        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
         # Switch back to the original pipe.
@@ -213,12 +209,8 @@
     def test_cam_free_rotor_no_pcs(self):
         """Test the free rotor frame order model of CaM."""
 
-        # Setup.
-        ds.flag_rdc = True
+        # Execute the script.
         ds.flag_pcs = False
-        ds.flag_opt = False
-
-        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor.py')
 
         # Switch back to the original pipe.
@@ -234,11 +226,6 @@
     def test_cam_free_rotor2(self):
         """Test the second free rotor frame order model of CaM."""
 
-        # Setup.
-        ds.flag_rdc = True
-        ds.flag_pcs = True
-        ds.flag_opt = False
-
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
@@ -255,12 +242,8 @@
     def test_cam_free_rotor2_no_rdc(self):
         """Test the second free rotor frame order model of CaM."""
 
-        # Setup.
+        # Execute the script.
         ds.flag_rdc = False
-        ds.flag_pcs = True
-        ds.flag_opt = False
-
-        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
         # Switch back to the original pipe.
@@ -276,12 +259,8 @@
     def test_cam_free_rotor2_no_pcs(self):
         """Test the second free rotor frame order model of CaM."""
 
-        # Setup.
-        ds.flag_rdc = True
+        # Execute the script.
         ds.flag_pcs = False
-        ds.flag_opt = False
-
-        # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'cam'+sep+'free_rotor2.py')
 
         # Switch back to the original pipe.