r17791 - /trunk/test_suite/system_tests/model_free.py -- October 09, 2012 - 15:59

Author: bugman
Date: Tue Oct  9 15:59:34 2012
New Revision: 17791

URL: http://svn.gna.org/viewcvs/relax?rev=17791&view=rev
Log:
Fix for the Mf.test_write_results() system test for Python 3.1.

The XML version in Python 3.1 is the old style!  Therefore the old results 
file is being used to
check this Python 3.1 result.


Modified:
    trunk/test_suite/system_tests/model_free.py

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=17791&r1=17790&r2=17791&view=diff
==============================================================================
--- trunk/test_suite/system_tests/model_free.py (original)
+++ trunk/test_suite/system_tests/model_free.py Tue Oct  9 15:59:34 2012
@@ -2620,13 +2620,23 @@
         test_lines = file.readlines()
         file.close()
 
-        # Read the 1.3 results file, extract the data, then close it again.
-        if sys.version_info[0] >= 3:
+        # Read the results file for Python 3.2+.
+        if sys.version_info[0] >= 3 and sys.version_info[0] >= 2:
             file = open_read_file(file_name='final_results_trunc_2.1_py3', 
dir=path)
+
+        # Read the results file for Python 3.1.
+        if sys.version_info[0] >= 3 and sys.version_info[0] == 1:
+            file = open_read_file(file_name='final_results_trunc_1.3_v2', 
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_1.3_v2', 
dir=path)
+
+        # Read the results file for pre Python 2.7.3 versions.
         else:
             file = 
open_read_file(file_name='final_results_trunc_1.3_pre_py2.7.3_v2', dir=path)
+
+        # Extract the data, then close the results file.
         true_lines = file.readlines()
         file.close()