r24083 - in /branches/disp_spin_speed: ./ test_suite/verification_tests/library.py -- June 18, 2014 - 11:46

Author: tlinnet
Date: Wed Jun 18 11:46:33 2014
New Revision: 24083

URL: http://svn.gna.org/viewcvs/relax?rev=24083&view=rev
Log:
Merged revisions 24058 via svnmerge from 
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk

........
  r24058 | bugman | 2014-06-17 19:46:10 +0200 (Tue, 17 Jun 2014) | 6 lines
  
  Fix for the Library.test_library_independence verification test on MS 
Windows.
  
  The tearDown() method now uses the error handling 
test_suite.clean_up.deletion() function to remove
  the copied version of the relax library.
........

Modified:
    branches/disp_spin_speed/   (props changed)
    branches/disp_spin_speed/test_suite/verification_tests/library.py

Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 18 11:46:33 2014
@@ -1 +1 @@
-/trunk:1-24051
+/trunk:1-24082

Modified: branches/disp_spin_speed/test_suite/verification_tests/library.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/verification_tests/library.py?rev=24083&r1=24082&r2=24083&view=diff
==============================================================================
--- branches/disp_spin_speed/test_suite/verification_tests/library.py   
(original)
+++ branches/disp_spin_speed/test_suite/verification_tests/library.py   Wed 
Jun 18 11:46:33 2014
@@ -32,6 +32,7 @@
 
 # relax module imports.
 from status import Status; status = Status()
+from test_suite.clean_up import deletion
 
 
 class Library(TestCase):
@@ -48,7 +49,7 @@
         """Clean up after the library tests."""
 
         # Remove the temporary directory and all its contents.
-        rmtree(self.tmpdir)
+        deletion(obj=self, name='tmpdir', dir=True)
 
 
     def test_library_independence(self):