r5939 - in /1.3/test_suite/system_tests: data/model_free/results.bz2 data/model_free/results_1.2.bz2 model_free.py -- April 21, 2008 - 23:14

Author: bugman
Date: Mon Apr 21 23:14:05 2008
New Revision: 5939

URL: http://svn.gna.org/viewcvs/relax?rev=5939&view=rev
Log:
Renamed the test_read_results() system test to test_read_results_1_2().

This is because the results file is in the 1.2 line format.  Hence the 
results file has been renamed
as well.  The loading of the 1.2 program state has also been axed.


Added:
    1.3/test_suite/system_tests/data/model_free/results_1.2.bz2
      - copied unchanged from r5937, 
1.3/test_suite/system_tests/data/model_free/results.bz2
Removed:
    1.3/test_suite/system_tests/data/model_free/results.bz2
Modified:
    1.3/test_suite/system_tests/model_free.py

Removed: 1.3/test_suite/system_tests/data/model_free/results.bz2
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/data/model_free/results.bz2?rev=5938&view=auto
==============================================================================
Binary file - 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=5939&r1=5938&r2=5939&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Mon Apr 21 23:14:05 2008
@@ -643,14 +643,11 @@
         self.assertEqual(cdp.mol[0].res[1].spin[0].relax_error[0], 
0.027749955318795365)
 
 
-    def test_read_results(self):
-        """The reading of model-free results using the user function 
results.read()."""
-
-        # Load the original state.
-        self.relax.interpreter._State.load(state='orig_state', 
dir_name=sys.path[-1] + '/test_suite/system_tests/data/model_free')
+    def test_read_results_1_2(self):
+        """Read a relax 1.2 model-free results file using the user function 
results.read()."""
 
         # Read the results.
-        self.relax.interpreter._Results.read(dir=sys.path[-1] + 
'/test_suite/system_tests/data/model_free')
+        self.relax.interpreter._Results.read(file='results_1.2', 
dir=sys.path[-1] + '/test_suite/system_tests/data/model_free')
 
         # Alias the current data pipe.
         cdp = relax_data_store[relax_data_store.current_pipe]