r13714 - in /branches/gui_testing/test_suite/system_tests: diffusion_tensor.py state.py -- July 19, 2011 - 12:08

Author: bugman
Date: Tue Jul 19 12:08:51 2011
New Revision: 13714

URL: http://svn.gna.org/viewcvs/relax?rev=13714&view=rev
Log:
System test fixes for the deletion of ds.tmpfile and ds.tmpdir when relax is 
reset.

The names are now stored in self - as they were a few revisions ago.


Modified:
    branches/gui_testing/test_suite/system_tests/diffusion_tensor.py
    branches/gui_testing/test_suite/system_tests/state.py

Modified: branches/gui_testing/test_suite/system_tests/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/diffusion_tensor.py?rev=13714&r1=13713&r2=13714&view=diff
==============================================================================
--- branches/gui_testing/test_suite/system_tests/diffusion_tensor.py 
(original)
+++ branches/gui_testing/test_suite/system_tests/diffusion_tensor.py Tue Jul 
19 12:08:51 2011
@@ -59,21 +59,21 @@
         self.interpreter.structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1)
         self.interpreter.sequence.read(file='Ap4Aase.seq', 
dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep, 
res_num_col=1, res_name_col=2)
         self.interpreter.diffusion_tensor.init(10e-9, fixed=True)
-        ds.tmpfile_sphere = mktemp()
+        self.tmpfile_sphere = mktemp()
 
         # Spheroid tensor initialization.
         self.interpreter.pipe.switch('spheroid')
         self.interpreter.structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1)
         self.interpreter.sequence.read(file='Ap4Aase.seq', 
dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep, 
res_num_col=1, res_name_col=2)
         self.interpreter.diffusion_tensor.init((5e-09, -10000000., 1.6, 
2.7), angle_units='rad', spheroid_type='oblate', fixed=True)
-        ds.tmpfile_spheroid = mktemp()
+        self.tmpfile_spheroid = mktemp()
 
         # Ellipsoid tensor initialization.
         self.interpreter.pipe.switch('ellipsoid')
         self.interpreter.structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'structures', read_model=1)
         self.interpreter.sequence.read(file='Ap4Aase.seq', 
dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep, 
res_num_col=1, res_name_col=2)
         self.interpreter.diffusion_tensor.init((9e-8, 5e6, 0.3, 60+360, 290, 
100), fixed=False)
-        ds.tmpfile_ellipsoid = mktemp()
+        self.tmpfile_ellipsoid = mktemp()
 
 
         # Some fake MC simulations (for the sphere).
@@ -157,9 +157,9 @@
         reset()
 
         # Delete the temporary files.
-        delete(ds.tmpfile_sphere, fail=False)
-        delete(ds.tmpfile_spheroid, fail=False)
-        delete(ds.tmpfile_ellipsoid, fail=False)
+        delete(self.tmpfile_sphere, fail=False)
+        delete(self.tmpfile_spheroid, fail=False)
+        delete(self.tmpfile_ellipsoid, fail=False)
 
 
     def check_ellipsoid(self, Dx, Dy, Dz, Diso, Da, Dr, alpha, beta, gamma, 
D, D_prime, R):
@@ -484,10 +484,10 @@
         self.interpreter.diffusion_tensor.copy('ellipsoid', 'ellipsoid2')
 
         # Create the diffusion tensor objects.
-        
self.interpreter.structure.create_diff_tensor_pdb(file=ds.tmpfile_ellipsoid, 
scale=1e-05)
+        
self.interpreter.structure.create_diff_tensor_pdb(file=self.tmpfile_ellipsoid,
 scale=1e-05)
 
         # Open the temp file.
-        file = open(ds.tmpfile_ellipsoid)
+        file = open(self.tmpfile_ellipsoid)
         new_data = file.readlines()
         file.close()
 
@@ -516,10 +516,10 @@
         self.interpreter.diffusion_tensor.copy('sphere', 'sphere2')
 
         # Create the diffusion tensor objects.
-        
self.interpreter.structure.create_diff_tensor_pdb(file=ds.tmpfile_sphere)
+        
self.interpreter.structure.create_diff_tensor_pdb(file=self.tmpfile_sphere)
 
         # Open the temp file.
-        file = open(ds.tmpfile_sphere)
+        file = open(self.tmpfile_sphere)
         new_data = file.readlines()
         file.close()
 
@@ -548,10 +548,10 @@
         self.interpreter.diffusion_tensor.copy('spheroid', 'spheroid2')
 
         # Create the diffusion tensor objects.
-        
self.interpreter.structure.create_diff_tensor_pdb(file=ds.tmpfile_spheroid)
+        
self.interpreter.structure.create_diff_tensor_pdb(file=self.tmpfile_spheroid)
 
         # Open the temp file.
-        file = open(ds.tmpfile_spheroid)
+        file = open(self.tmpfile_spheroid)
         new_data = file.readlines()
         file.close()
 

Modified: branches/gui_testing/test_suite/system_tests/state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/state.py?rev=13714&r1=13713&r2=13714&view=diff
==============================================================================
--- branches/gui_testing/test_suite/system_tests/state.py (original)
+++ branches/gui_testing/test_suite/system_tests/state.py Tue Jul 19 12:08:51 
2011
@@ -38,7 +38,7 @@
         """Common set up for these system tests."""
 
         # Create a temporary file name.
-        ds.tmpfile = mktemp()
+        self.tmpfile = mktemp()
 
 
     def test_state_pickle(self):
@@ -48,16 +48,16 @@
         self.interpreter.pipe.create('test', 'mf')
 
         # Save the state.
-        self.interpreter.state.save(ds.tmpfile, pickle=True, force=True)
+        self.interpreter.state.save(self.tmpfile, pickle=True, force=True)
 
         # Load the state.
-        self.interpreter.state.load(ds.tmpfile, force=True)
+        self.interpreter.state.load(self.tmpfile, force=True)
 
         # Save the state.
-        self.interpreter.state.save(ds.tmpfile, dir=None, pickle=True, 
force=True)
+        self.interpreter.state.save(self.tmpfile, dir=None, pickle=True, 
force=True)
 
         # Load the state.
-        self.interpreter.state.load(ds.tmpfile, force=True)
+        self.interpreter.state.load(self.tmpfile, force=True)
 
 
     def test_state_xml(self):
@@ -67,16 +67,16 @@
         self.interpreter.pipe.create('test', 'mf')
 
         # Save the state.
-        self.interpreter.state.save(ds.tmpfile, pickle=False, force=True)
+        self.interpreter.state.save(self.tmpfile, pickle=False, force=True)
 
         # Load the state.
-        self.interpreter.state.load(ds.tmpfile, force=True)
+        self.interpreter.state.load(self.tmpfile, force=True)
 
         # Save the state.
-        self.interpreter.state.save(ds.tmpfile, pickle=False, force=True)
+        self.interpreter.state.save(self.tmpfile, pickle=False, force=True)
 
         # Load the state.
-        self.interpreter.state.load(ds.tmpfile, force=True)
+        self.interpreter.state.load(self.tmpfile, force=True)
 
 
     def test_write_read_pipes(self):
@@ -97,13 +97,13 @@
             self.interpreter.pipe.create('test' + repr(i), pipe_types[i])
 
         # Write the results.
-        self.interpreter.state.save(ds.tmpfile)
+        self.interpreter.state.save(self.tmpfile)
 
         # Reset relax.
         reset()
 
         # Re-read the results.
-        self.interpreter.state.load(ds.tmpfile)
+        self.interpreter.state.load(self.tmpfile)
 
         # Test the pipes.
         for i in range(len(pipe_types)):