r21185 - /branches/relax_disp/test_suite/system_tests/relax_disp.py -- October 18, 2013 - 19:39

Author: bugman
Date: Fri Oct 18 19:39:15 2013
New Revision: 21185

URL: http://svn.gna.org/viewcvs/relax?rev=21185&view=rev
Log:
Fix for the relaxation dispersion system test tearDown() method.

The rmtree function is no longer user, rather the 
test_suite.clean_up.deletion() function is being
used to handle the issue of MS Windows not releasing the file in time.


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=21185&r1=21184&r2=21185&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Fri Oct 18 
19:39:15 2013
@@ -22,7 +22,6 @@
 
 # Python module imports.
 from os import F_OK, access, sep
-from shutil import rmtree
 from tempfile import mkdtemp
 
 # relax module imports.
@@ -33,6 +32,7 @@
 from specific_analyses.relax_disp.disp_data import get_curve_type
 from specific_analyses.relax_disp.variables import MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_LIST_CPMG, MODEL_LM63, MODEL_M61B, 
MODEL_NOREX, MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_R2EFF
 from status import Status; status = Status()
+from test_suite.clean_up import deletion
 from test_suite.system_tests.base_classes import SystemTestCase
 
 
@@ -77,7 +77,8 @@
         """Reset the relax data storage object."""
 
         # Remove the temporary directory.
-        rmtree(self.tmpdir)
+        deletion(obj=ds, name='tmpdir', dir=True)
+        deletion(obj=self, name='tmpdir', dir=True)
 
         # Reset the relax data storage object.
         ds.__reset__()