r2405 - in /1.2/test_suite: model_free.py relax_fit.py sequence.py -- March 24, 2006 - 03:21

Author: bugman
Date: Fri Mar 24 03:21:17 2006
New Revision: 2405

URL: http://svn.gna.org/viewcvs/relax?rev=2405&view=rev
Log:
Fixed a number of tests in the test suite which were pointing to the wrong 
directory.


Modified:
    1.2/test_suite/model_free.py
    1.2/test_suite/relax_fit.py
    1.2/test_suite/sequence.py

Modified: 1.2/test_suite/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2405&r1=2404&r2=2405&view=diff
==============================================================================
--- 1.2/test_suite/model_free.py (original)
+++ 1.2/test_suite/model_free.py Fri Mar 24 03:21:17 2006
@@ -45,13 +45,13 @@
         self.run = run
 
         # Load the original state.
-        self.relax.interpreter._State.load(file='orig_state', 
dir=sys.path[-1] + '/testing/data/model_free')
+        self.relax.interpreter._State.load(file='orig_state', 
dir=sys.path[-1] + '/test_suite/data/model_free')
 
         # Create the run.
         self.relax.generic.runs.create(self.run, 'mf')
 
         # Read the results.
-        self.relax.interpreter._Results.read(self.run, dir=sys.path[-1] + 
'/testing/data/model_free')
+        self.relax.interpreter._Results.read(self.run, dir=sys.path[-1] + 
'/test_suite/data/model_free')
 
         # Success.
         return self.test_integrity()

Modified: 1.2/test_suite/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/relax_fit.py?rev=2405&r1=2404&r2=2405&view=diff
==============================================================================
--- 1.2/test_suite/relax_fit.py (original)
+++ 1.2/test_suite/relax_fit.py Fri Mar 24 03:21:17 2006
@@ -45,16 +45,16 @@
         self.run = run
 
         # Load the original state.
-        self.relax.interpreter._State.load(file='rx.save', dir=sys.path[-1] 
+ '/testing/data/curve_fitting')
+        self.relax.interpreter._State.load(file='rx.save', dir=sys.path[-1] 
+ '/test_suite/data/curve_fitting')
 
         # Create the run.
         self.relax.generic.runs.create(self.run, "mf")
 
         # Load the Lupin Ap4Aase sequence.
-        self.relax.interpreter._Sequence.read(self.run, file="Ap4Aase.seq", 
dir=sys.path[-1] + "/testing/data")
+        self.relax.interpreter._Sequence.read(self.run, file="Ap4Aase.seq", 
dir=sys.path[-1] + "/test_suite/data")
 
         # Read the peak heights.
-        self.relax.interpreter._Relax_fit.read(self.run, 
file="T2_ncyc1_ave.list", dir=sys.path[-1] + "/testing/data/curve_fitting", 
relax_time=0.0176)
+        self.relax.interpreter._Relax_fit.read(self.run, 
file="T2_ncyc1_ave.list", dir=sys.path[-1] + 
"/test_suite/data/curve_fitting", relax_time=0.0176)
 
 
         # Test the integrity of the data.

Modified: 1.2/test_suite/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/sequence.py?rev=2405&r1=2404&r2=2405&view=diff
==============================================================================
--- 1.2/test_suite/sequence.py (original)
+++ 1.2/test_suite/sequence.py Fri Mar 24 03:21:17 2006
@@ -53,7 +53,7 @@
         self.relax.generic.runs.create(run, 'mf')
 
         # Read the sequence.
-        self.relax.interpreter._PDB.pdb(run, file='test.pdb', 
dir=sys.path[-1] + '/testing/data', model=1, heteronuc='N', proton='H', 
load_seq=1)
+        self.relax.interpreter._PDB.pdb(run, file='test.pdb', 
dir=sys.path[-1] + '/test_suite/data', model=1, heteronuc='N', proton='H', 
load_seq=1)
 
         # Success.
         return 1
@@ -66,7 +66,7 @@
         self.relax.generic.runs.create(run, 'mf')
 
         # Read the sequence.
-        self.relax.interpreter._Sequence.read(run, file='test_seq', 
dir=sys.path[-1] + '/testing/data')
+        self.relax.interpreter._Sequence.read(run, file='test_seq', 
dir=sys.path[-1] + '/test_suite/data')
 
         # Success.
         return 1