r15801 - in /1.3/test_suite: shared_data/model_free/OMP/final_results_trunc_1.3_new.bz2 system_tests/model_free.py -- April 24, 2012 - 09:46

Author: bugman
Date: Tue Apr 24 09:46:57 2012
New Revision: 15801

URL: http://svn.gna.org/viewcvs/relax?rev=15801&view=rev
Log:
The Mf.test_write_results system test now works with the newer Python 2.7.3 
version.

The final_results_trunc_1.3_new.bz2 file was updated to be a results file 
rather than save state,
and the system test itself now checks the Python version and then loads the 
correct results file for
that version.


Modified:
    1.3/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_new.bz2
    1.3/test_suite/system_tests/model_free.py

Modified: 
1.3/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_new.bz2
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_new.bz2?rev=15801&r1=15800&r2=15801&view=diff
==============================================================================
Binary files - no diff available.

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=15801&r1=15800&r2=15801&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Tue Apr 24 09:46:57 2012
@@ -2501,7 +2501,11 @@
         file.close()
 
         # Read the 1.3 results file, extract the data, then close it again.
-        file = open_read_file(file_name='final_results_trunc_1.3', dir=path)
+        a, b, c = platform.python_version_tuple()
+        if int(a) >= 2 and int(b) >= 7 and int(c) >= 3:
+            file = open_read_file(file_name='final_results_trunc_1.3_new', 
dir=path)
+        else:
+            file = open_read_file(file_name='final_results_trunc_1.3', 
dir=path)
         true_lines = file.readlines()
         file.close()