tahoe_fuse.py: system test: Distinguish between TestFailures and unexpected exception...

diff --git a/contrib/fuse/runtests.py b/contrib/fuse/runtests.py
index ff7d3cf2ef74402ee12e2b3a2b1bad0a17c16fc3..d38c2b823bfc31a6f1a316896d70c758f8a6de2b 100644 (file)
--- a/contrib/fuse/runtests.py
+++ b/contrib/fuse/runtests.py
@@ -251,12 +251,15 @@ class SystemTest (object):
                     method = getattr(self, name)
                     method(mountpoint)
                     print 'Test succeeded.'
-                except:
-                    print 'Test failed (details follow):'
-                    traceback.print_exc()
+                except self.TestFailure, f:
+                    print f
                     failures += 1
+                except:
+                    print 'Error in test code...  Cleaning up.'
+                    raise
+
+        print '\n*** Testing complete: %d failed out of %d.' % (failures, total)           
 
-        print '\n*** Testing complete: %d failured out of %d.' % (failures, total)           
 
     # Tests:
     def test_00_empty_directory_listing(self, mountpoint):