alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-04-07 00:00:03 +03:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

bcachefs-tools: fix test bug in valgrind handling.

Browse Source 
Signed-off-by: Justin Husted <sigstop@gmail.com>
This commit is contained in:
Justin Husted 2019-12-28 16:56:24 -08:00
parent ff2b85e039
commit 1b74a2bba1
1 changed files with 15 additions and 9 deletions

24
tests/util.py
View File

@ -22,10 +22,14 @@ class ValgrindFailedError(Exception):
def __init__(self, log): def __init__(self, log):
self.log = log self.log = log
def check_valgrind(logfile): def check_valgrind(log):
log = logfile.read().decode('utf-8')
m = VPAT.search(log) m = VPAT.search(log)
assert m is not None, 'Internal error: valgrind log did not match.' if m is None:
print('Internal error: valgrind log did not match.')
print('-- valgrind log:')
print(log)
print('-- end log --')
assert False
errors = int(m.group(1)) errors = int(m.group(1))
if errors > 0: if errors > 0:
@ -53,7 +57,7 @@ def run(cmd, *args, valgrind=False, check=False):
encoding='utf-8', check=check) encoding='utf-8', check=check)
if valgrind: if valgrind:
check_valgrind(vout) check_valgrind(vout.read().decode('utf-8'))
return res return res
@ -150,14 +154,14 @@ class BFuse:
def run(self): def run(self):
"""Background thread which runs "bcachefs fusemount" under valgrind""" """Background thread which runs "bcachefs fusemount" under valgrind"""
vout = None vlog = None
cmd = [] cmd = []
if ENABLE_VALGRIND: if ENABLE_VALGRIND:
vout = tempfile.NamedTemporaryFile() vlog = tempfile.NamedTemporaryFile()
cmd += [ 'valgrind', cmd += [ 'valgrind',
'--leak-check=full', '--leak-check=full',
'--log-file={}'.format(vout.name) ] '--log-file={}'.format(vlog.name) ]
cmd += [ BCH_PATH, cmd += [ BCH_PATH,
'fusemount', '-f', self.dev, self.mnt] 'fusemount', '-f', self.dev, self.mnt]
@ -178,7 +182,7 @@ class BFuse:
self.stdout = out1 + out2 self.stdout = out1 + out2
self.stderr = err.read() self.stderr = err.read()
self.returncode = self.proc.returncode self.returncode = self.proc.returncode
self.vout = vout self.vout = vlog.read().decode('utf-8')
def expect(self, pipe, regex): def expect(self, pipe, regex):
"""Wait for the child process to mount.""" """Wait for the child process to mount."""
@ -208,13 +212,15 @@ class BFuse:
def unmount(self, timeout=None): def unmount(self, timeout=None):
print("Unmounting fuse.") print("Unmounting fuse.")
run("fusermount3", "-zu", self.mnt) run("fusermount3", "-zu", self.mnt)
print("Waiting for thread to exit.")
if self.thread: if self.thread:
print("Waiting for thread to exit.")
self.thread.join(timeout) self.thread.join(timeout)
if self.thread.is_alive(): if self.thread.is_alive():
self.proc.kill() self.proc.kill()
self.thread.join() self.thread.join()
else:
print("Thread was already done.")
self.thread = None self.thread = None
self.ready.clear() self.ready.clear()