r16355 - /branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py -- May 18, 2012 - 20:09

Author: bugman
Date: Fri May 18 20:09:12 2012
New Revision: 16355

URL: http://svn.gna.org/viewcvs/relax?rev=16355&view=rev
Log:
Fix for the specific_fns.model_free unit tests for the results.read uf arg 
name change.

The directory is now specified via the 'dir' arg rather than 'directory'.


Modified:
    
branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py

Modified: 
branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py?rev=16355&r1=16354&r2=16355&view=diff
==============================================================================
--- 
branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
 (original)
+++ 
branches/uf_redesign/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
 Fri May 18 20:09:12 2012
@@ -58,7 +58,7 @@
         """Test the model-free duplicate_data() method."""
 
         # Read a model-free results file.
-        results.read(file='final_results_trunc_1.3', 
directory=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
+        results.read(file='final_results_trunc_1.3', dir=status.install_path 
+ sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
 
         # Duplicate the data.
         self.inst.duplicate_data('orig', 'new', model_info=0)
@@ -68,7 +68,7 @@
         """Test the model-free duplicate_data() method."""
 
         # Read a model-free results file.
-        results.read(file='final_results_trunc_1.3', 
directory=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
+        results.read(file='final_results_trunc_1.3', dir=status.install_path 
+ sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
 
         # Load a structure.
         structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1, 
parser='internal')
@@ -87,7 +87,7 @@
         """Test the model-free duplicate_data() method."""
 
         # Read a model-free results file.
-        results.read(file='final_results_trunc_1.3', 
directory=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
+        results.read(file='final_results_trunc_1.3', dir=status.install_path 
+ sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
 
         # Load a structure.
         structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1, 
parser='internal')
@@ -103,7 +103,7 @@
         """Test the failure of the model-free duplicate_data() method when 
the structures are not consistent."""
 
         # Read a model-free results file.
-        results.read(file='final_results_trunc_1.3', 
directory=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
+        results.read(file='final_results_trunc_1.3', dir=status.install_path 
+ sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
 
         # Load a structure.
         structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1, 
parser='internal')