r21685 - /trunk/test_suite/system_tests/base_classes.py -- November 27, 2013 - 18:01

Author: bugman
Date: Wed Nov 27 18:01:38 2013
New Revision: 21685

URL: http://svn.gna.org/viewcvs/relax?rev=21685&view=rev
Log:
The relax system test base tearDown() method should now be fail proof.

Most code is now warped in a 'try: except: pass' block to catch all failures.


Modified:
    trunk/test_suite/system_tests/base_classes.py

Modified: trunk/test_suite/system_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/base_classes.py?rev=21685&r1=21684&r2=21685&view=diff
==============================================================================
--- trunk/test_suite/system_tests/base_classes.py (original)
+++ trunk/test_suite/system_tests/base_classes.py Wed Nov 27 18:01:38 2013
@@ -65,13 +65,25 @@
     def tearDown(self):
         """Default tearDown operation - delete temp directories and files 
and reset relax."""
 
-        # Remove the temporary directory and variable.
-        deletion(obj=ds, name='tmpdir', dir=True)
-        deletion(obj=self, name='tmpdir', dir=True)
+        # Remove the temporary directory and variable (if there is a 
deletion failure, continue to allow the test suite to survive).
+        try:
+            deletion(obj=ds, name='tmpdir', dir=True)
+        except:
+            pass
+        try:
+            deletion(obj=self, name='tmpdir', dir=True)
+        except:
+            pass
 
-        # Remove temporary file and variable.
-        deletion(obj=ds, name='tmpfile', dir=False)
-        deletion(obj=self, name='tmpfile', dir=False)
+        # Remove temporary file and variable (if there is a deletion 
failure, continue to allow the test suite to survive).
+        try:
+            deletion(obj=ds, name='tmpfile', dir=False)
+        except:
+            pass
+        try:
+            deletion(obj=self, name='tmpfile', dir=False)
+        except:
+            pass
 
         # Reset relax.
         reset()