From c225c657d4280015e26dd22bdfad2756f4b8a900 Mon Sep 17 00:00:00 2001 From: nejucomo Date: Sun, 20 Jan 2008 17:54:48 -0700 Subject: [PATCH] tahoe_fuse: system test: factor out some cleanup code. --- contrib/fuse/runtests.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/contrib/fuse/runtests.py b/contrib/fuse/runtests.py index 5c55d9bd..41ec4a34 100644 --- a/contrib/fuse/runtests.py +++ b/contrib/fuse/runtests.py @@ -96,11 +96,7 @@ class SystemTest (object): finally: print 'Removing introducer directory.' - try: - shutil.rmtree(self.introbase) - except Exception, e: - print 'Exception removing test client directory: %r' % (self.introbase,) - print 'Ignoring cleanup exception: %r' % (e,) + self.cleanup_dir(self.introbase) def launch_introducer_layer(self): print 'Launching introducer.' @@ -136,11 +132,7 @@ class SystemTest (object): finally: print 'Removing client directory.' - try: - shutil.rmtree(self.clientbase) - except Exception, e: - print 'Exception removing test client directory: %r' % (self.clientbase,) - print 'Ignoring cleanup exception: %r' % (e,) + self.cleanup_dir(self.clientbase) def configure_client_layer(self): print 'Configuring client.' @@ -224,6 +216,12 @@ class SystemTest (object): tmpl += 'Actual directory: %r\n' raise self.SetupFailure(tmpl, expdir, m.group(1)) + def cleanup_dir(self, path): + try: + shutil.rmtree(path) + except Exception, e: + print 'Exception removing test directory: %r' % (path,) + print 'Ignoring cleanup exception: %r' % (e,) # SystemTest Exceptions: class Failure (Exception): -- 2.45.2