mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-04-15 06:36:40 +00:00
fuse_a: Fix a bug in test cleanup code.
This commit is contained in:
parent
73f6b974dc
commit
75f82bf734
@ -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.'
|
||||
|
Loading…
x
Reference in New Issue
Block a user