r12473 - in /branches/bmrb/test_suite/system_tests: bmrb.py scripts/bmrb_rw.py -- January 31, 2011 - 17:02

Author: bugman
Date: Mon Jan 31 17:02:11 2011
New Revision: 12473

URL: http://svn.gna.org/viewcvs/relax?rev=12473&view=rev
Log:
Fixes for the BMRB system tests - the install path is now in the status 
object and not __main__.


Modified:
    branches/bmrb/test_suite/system_tests/bmrb.py
    branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py

Modified: branches/bmrb/test_suite/system_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/bmrb.py?rev=12473&r1=12472&r2=12473&view=diff
==============================================================================
--- branches/bmrb/test_suite/system_tests/bmrb.py (original)
+++ branches/bmrb/test_suite/system_tests/bmrb.py Mon Jan 31 17:02:11 2011
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2008-2010 Edward d'Auvergne                                  
 #
+# Copyright (C) 2008-2011 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -21,7 +21,6 @@
 
###############################################################################
 
 # Python module imports.
-import __main__
 import inspect
 from numpy import ndarray
 from os import remove, sep
@@ -32,6 +31,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 Bmrb(SystemTestCase):
@@ -223,7 +223,7 @@
         ds.version = '3.0'
 
         # Execute the script.
-        self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
+        self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
         self.data_check(version='3.0')
@@ -236,7 +236,7 @@
         ds.version = '3.1'
 
         # Execute the script.
-        self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
+        self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
         self.data_check(version='3.1')

Modified: branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py?rev=12473&r1=12472&r2=12473&view=diff
==============================================================================
--- branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py (original)
+++ branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py Mon Jan 31 
17:02:11 2011
@@ -1,12 +1,12 @@
 # Script for testing the reading and writing of BMRB files.
 
 # Python module imports.
-import __main__
 import sys
 from os import sep
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+from status import Status; status = Status()
 
 
 # Missing temp file (allow this script to run outside of the system test 
framework).
@@ -21,7 +21,7 @@
 pipe.create(pipe_name='results', pipe_type='mf')
 
 # Read the results.
-results.read(file='final_results_trunc_1.3', dir=__main__.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')
 
 # Play with the data.
 deselect.all()
@@ -51,9 +51,9 @@
 bmrb.software_select('Sparky', version='3.106')
 bmrb.citation(cite_id='test', authors=[["Edward", "d'Auvergne", "E.", "J."], 
["Paul", "Gooley", "P.", "R."]], doi="10.1039/b702202f", 
pubmed_id="17579774", full_citation="d'Auvergne E. J., Gooley P. R. (2007). 
Set theory formulation of the model-free problem and the diffusion seeded 
model-free paradigm. Mol. Biosyst., 3(7), 483-494.", title="Set theory 
formulation of the model-free problem and the diffusion seeded model-free 
paradigm.", status="published", type="journal", journal_abbrev="Mol. 
Biosyst.", journal_full="Molecular Biosystems", volume=3, issue=7, 
page_first=483, page_last=498, year=2007)
 bmrb.software(name='X', url='http://nmr-relax.com', vendor_name='me', 
cite_ids=['test'], tasks=['procrastinating', 'nothing much', 'wasting time'])
-bmrb.script(file='noe.py', dir=__main__.install_path+sep+'sample_scripts', 
analysis_type='noe', engine='relax')
-bmrb.script(file='relax_fit.py', 
dir=__main__.install_path+sep+'sample_scripts', analysis_type='relax_fit', 
engine='relax')
-bmrb.script(file='full_analysis.py', 
dir=__main__.install_path+sep+'sample_scripts', analysis_type='mf', 
model_selection='AIC', engine='relax', model_elim=True, 
universal_solution=True)
+bmrb.script(file='noe.py', dir=status.install_path+sep+'sample_scripts', 
analysis_type='noe', engine='relax')
+bmrb.script(file='relax_fit.py', 
dir=status.install_path+sep+'sample_scripts', analysis_type='relax_fit', 
engine='relax')
+bmrb.script(file='full_analysis.py', 
dir=status.install_path+sep+'sample_scripts', analysis_type='mf', 
model_selection='AIC', engine='relax', model_elim=True, 
universal_solution=True)
 
 # Write, then read the data to a new data pipe.
 bmrb.write(file=ds.tmpfile, dir=None, version=ds.version, force=True)