r19731 - in /trunk/test_suite: shared_data/model_free/OMP/ system_tests/ -- May 24, 2013 - 16:12

Author: bugman
Date: Fri May 24 16:12:27 2013
New Revision: 19731

URL: http://svn.gna.org/viewcvs/relax?rev=19731&view=rev
Log:
Huge speed up of the system tests for the loading and creation of model-free 
saved states.

The OMP files used for the system test have been truncated from 134 to 7 
spins, changing the timing
of 6 system tests from 11-13 seconds to less than 0.5 seconds each.


Added:
    trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2
      - copied, changed from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.2.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
      - copied, changed from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v1.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2
      - copied, changed from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2
      - copied, changed from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v1.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2
      - copied, changed from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
      - copied, changed from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2_broken.bz2
    trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0.bz2
      - copied, changed from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
      - copied, changed from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2
Modified:
    trunk/test_suite/system_tests/model_free.py

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2 
(from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.2.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.2.bz2&r1=19728&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
 (from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v1.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v1.bz2&r1=19728&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2
 (from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2&r1=19729&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2 
(from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v1.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v1.bz2&r1=19728&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2 
(from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2.bz2&r1=19728&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
 (from r19728, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2_broken.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_v2_broken.bz2&r1=19728&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0.bz2 
(from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2&r1=19729&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Copied: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
 (from r19729, 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2?p2=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2&p1=trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2&r1=19729&r2=19731&rev=19731&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=19731&r1=19730&r2=19731&view=diff
==============================================================================
--- trunk/test_suite/system_tests/model_free.py (original)
+++ trunk/test_suite/system_tests/model_free.py Fri May 24 16:12:27 2013
@@ -79,7 +79,7 @@
 
         # Read the equivalent 1.2 results file for the checks.
         self.interpreter.pipe.create('1.2', 'mf')
-        self.interpreter.results.read(file='final_results_trunc_1.2', 
dir=path)
+        self.interpreter.results.read(file='final_results_trunc2_1.2', 
dir=path)
 
         # Get the two data pipes.
         pipe_12 = pipes.get_pipe('1.2')
@@ -2771,7 +2771,7 @@
 
         # Read the results file.
         self.interpreter.pipe.create('1.3', 'mf')
-        self.interpreter.results.read(file='final_results_trunc_1.3_v1', 
dir=path)
+        self.interpreter.results.read(file='final_results_trunc2_1.3_v1', 
dir=path)
 
         # The shared part of the test.
         self.check_read_results_1_3()
@@ -2785,7 +2785,7 @@
 
         # Read the results file.
         self.interpreter.pipe.create('1.3', 'mf')
-        
self.interpreter.results.read(file='final_results_trunc_1.3_pre_py2.7.3_v1', 
dir=path)
+        
self.interpreter.results.read(file='final_results_trunc2_1.3_pre_py2.7.3_v1', 
dir=path)
 
         # The shared part of the test.
         self.check_read_results_1_3()
@@ -2799,7 +2799,7 @@
 
         # Read the results file.
         self.interpreter.pipe.create('1.3', 'mf')
-        self.interpreter.results.read(file='final_results_trunc_1.3_v2', 
dir=path)
+        self.interpreter.results.read(file='final_results_trunc2_1.3_v2', 
dir=path)
 
         # The shared part of the test.
         self.check_read_results_1_3()
@@ -2816,7 +2816,7 @@
 
         # Read the results file.
         self.interpreter.pipe.create('1.3', 'mf')
-        
self.interpreter.results.read(file='final_results_trunc_1.3_v2_broken', 
dir=path)
+        
self.interpreter.results.read(file='final_results_trunc2_1.3_v2_broken', 
dir=path)
 
         # The shared part of the test.
         self.check_read_results_1_3()
@@ -2830,7 +2830,7 @@
 
         # Read the results file.
         self.interpreter.pipe.create('1.3', 'mf')
-        
self.interpreter.results.read(file='final_results_trunc_1.3_pre_py2.7.3_v2', 
dir=path)
+        
self.interpreter.results.read(file='final_results_trunc2_1.3_pre_py2.7.3_v2', 
dir=path)
 
         # The shared part of the test.
         self.check_read_results_1_3()
@@ -2993,7 +2993,7 @@
         path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP'
 
         # Read the results file.
-        self.interpreter.results.read(file='final_results_trunc_1.2', 
dir=path)
+        self.interpreter.results.read(file='final_results_trunc2_1.2', 
dir=path)
 
         # A dummy file object for catching the results.write() output.
         file = DummyFileObject()
@@ -3007,19 +3007,19 @@
 
         # Read the results file for Python 3.2+.
         if sys.version_info[0] >= 3 and sys.version_info[1] >= 2:
-            file = open_read_file(file_name='final_results_trunc_3.0', 
dir=path)
+            file = open_read_file(file_name='final_results_trunc2_3.0', 
dir=path)
 
         # Read the results file for Python 3.1.
         elif sys.version_info[0] >= 3 and sys.version_info[1] == 1:
-            file = 
open_read_file(file_name='final_results_trunc_3.0_oldxml', dir=path)
+            file = 
open_read_file(file_name='final_results_trunc2_3.0_oldxml', dir=path)
 
         # Read the results file for Python 2.7.3+ (excluding Python 3).
         elif dep_check.xml_type == 'internal' and sys.version_info[0] >= 2 
and sys.version_info[1] >= 7 and sys.version_info[2] >= 3:
-            file = open_read_file(file_name='final_results_trunc_3.0', 
dir=path)
+            file = open_read_file(file_name='final_results_trunc2_3.0', 
dir=path)
 
         # Read the results file for pre Python 2.7.3 versions.
         else:
-            file = 
open_read_file(file_name='final_results_trunc_3.0_oldxml', dir=path)
+            file = 
open_read_file(file_name='final_results_trunc2_3.0_oldxml', dir=path)
 
         # Extract the data, then close the results file.
         true_lines = file.readlines()