r21188 - in /branches/relax_disp: ./ test_suite/clean_up.py -- October 18, 2013 - 20:15

Author: bugman
Date: Fri Oct 18 20:15:03 2013
New Revision: 21188

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

........
  r21187 | bugman | 2013-10-18 20:12:35 +0200 (Fri, 18 Oct 2013) | 5 lines
  
  The test_suite.clean_up.deletion() function can now handle the case of 
missing files and directories.
  
  This problem was occurring in the relax_disp branch for some of the system 
tests.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/clean_up.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 18 20:15:03 2013
@@ -1,1 +1,1 @@
-/trunk:1-21173
+/trunk:1-21187

Modified: branches/relax_disp/test_suite/clean_up.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/clean_up.py?rev=21188&r1=21187&r2=21188&view=diff
==============================================================================
--- branches/relax_disp/test_suite/clean_up.py (original)
+++ branches/relax_disp/test_suite/clean_up.py Fri Oct 18 20:15:03 2013
@@ -78,3 +78,7 @@
 
         finally:
             del var
+
+    # Already deleted.
+    except OSError:
+        pass