r19254 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- March 27, 2013 - 15:53

Author: bugman
Date: Wed Mar 27 15:53:41 2013
New Revision: 19254

URL: http://svn.gna.org/viewcvs/relax?rev=19254&view=rev
Log:
Ported r12837 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r12836:12837 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .

.....
  r12837 | bugman | 2011-05-31 12:56:16 +0200 (Tue, 31 May 2011) | 5 lines
  Changed paths:
     M /branches/relax_disp/test_suite/system_tests/relax_disp.py
  
  Fixes for the relaxation dispersion system tests.
  
  The install path is now in the status object, and not in __main__.
.....


Modified:
    branches/relax_disp/test_suite/system_tests/relax_disp.py

Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=19254&r1=19253&r2=19254&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Mar 27 
15:53:41 2013
@@ -22,7 +22,6 @@
 
###############################################################################
 
 # Python module imports.
-import __main__
 from os import sep
 from shutil import rmtree
 from tempfile import mkdtemp
@@ -30,6 +29,7 @@
 # relax module imports.
 from base_classes import SystemTestCase
 from data import Relax_data_store; ds = Relax_data_store()
+from status import Status; status = Status()
 
 
 class Relax_disp(SystemTestCase):
@@ -61,7 +61,7 @@
         fast-exchange limit."""
 
         # Execute the script.
-        self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp_cpmg_fast.py')
+        self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp_cpmg_fast.py')
 
 
     def test_curve_fitting_cpmg_slow(self):
@@ -69,7 +69,7 @@
         slow-exchange limit."""
 
         # Execute the script.
-        self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp_cpmg_slow.py')
+        self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp_cpmg_slow.py')
 
 
     def test_read_r2eff(self):
@@ -81,7 +81,7 @@
         self.interpreter.residue.create(3, 'Gly')
 
         # Read the file.
-        self.interpreter.relax_data.read('R2eff', '600', 600 * 1e6, 
'r2eff.out', dir=__main__.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'r2eff')
+        self.interpreter.relax_data.read('R2eff', '600', 600 * 1e6, 
'r2eff.out', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'r2eff')
 
         # Test the data.