From: nejucomo <nejucomo@gmail.com>
Date: Sun, 1 Jun 2008 02:05:41 +0000 (-0700)
Subject: fuse_a: Fix a bug in test cleanup code.
X-Git-Tag: allmydata-tahoe-1.1.0~65
X-Git-Url: https://git.rkrishnan.org/%3C?a=commitdiff_plain;h=75f82bf73462eb3ea9520e6cf0b781aecbe03a92;p=tahoe-lafs%2Ftahoe-lafs.git

fuse_a: Fix a bug in test cleanup code.
---

diff --git a/contrib/fuse_a/runtests.py b/contrib/fuse_a/runtests.py
index 5946c702..b050856c 100644
--- a/contrib/fuse_a/runtests.py
+++ b/contrib/fuse_a/runtests.py
@@ -212,8 +212,10 @@ class SystemTest (object):
         thispath = os.path.abspath(sys.argv[0])
         thisdir = os.path.dirname(thispath)
         fusescript = os.path.join(thisdir, 'tahoe_fuse.py')
+        proc = None
         try:
-            proc = subprocess.Popen([fusescript,
+            proc = subprocess.Popen(['python',
+                                     fusescript,
                                      mp,
                                      '-f',
                                      '--basedir', self.clientbase])
@@ -227,7 +229,7 @@ class SystemTest (object):
         finally:
             print '\n*** Cleaning up system test'
 
-            if proc.poll() is None:
+            if proc is not None and proc.poll() is None:
                 print 'Killing fuse interface.'
                 os.kill(proc.pid, signal.SIGTERM)
                 print 'Waiting for the fuse interface to exit.'