mirrors/libfuse
0
0
Fork 0
mirror of https://github.com/libfuse/libfuse.git synced 2024-12-04 09:34:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increase timeouts in notify_* tests

Browse Source 
When running under Valgrind, we otherwise get sporadic test failures.
This commit is contained in:
Nikolaus Rath 2016-10-09 20:49:41 -07:00
parent 7e562d59d4
commit cf4159156b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/test_examples.py
View File

@ -151,16 +151,21 @@ def test_notify1(tmpdir, name, options, notify):
mnt_dir = str(tmpdir) mnt_dir = str(tmpdir)
cmdline = base_cmdline + \ cmdline = base_cmdline + \
[ pjoin(basename, 'example', name), [ pjoin(basename, 'example', name),
'-f', '--update-interval=1', mnt_dir ] + options '-f', '--update-interval=2', mnt_dir ] + options
if not notify: if not notify:
cmdline.append('--no-notify') cmdline.append('--no-notify')
mount_process = subprocess.Popen(cmdline) mount_process = subprocess.Popen(cmdline)
try: try:
wait_for_mount(mount_process, mnt_dir) wait_for_mount(mount_process, mnt_dir)
filename = pjoin(mnt_dir, 'current_time') filename = pjoin(mnt_dir, 'current_time')
with open(filename, 'r') as fh: # Wait until first update
read1 = fh.read() while True:
safe_sleep(2) with open(filename, 'r') as fh:
read1 = fh.read()
if read1:
break
safe_sleep(2)
safe_sleep(6)
with open(filename, 'r') as fh: with open(filename, 'r') as fh:
read2 = fh.read() read2 = fh.read()
if notify: if notify:
@ -179,7 +184,7 @@ def test_notify_inval_entry(tmpdir, notify):
cmdline = base_cmdline + \ cmdline = base_cmdline + \
[ pjoin(basename, 'example', 'notify_inval_entry'), [ pjoin(basename, 'example', 'notify_inval_entry'),
'-f', '--update-interval=2', '-f', '--update-interval=2',
'--timeout=4', mnt_dir ] '--timeout=10', mnt_dir ]
if not notify: if not notify:
cmdline.append('--no-notify') cmdline.append('--no-notify')
mount_process = subprocess.Popen(cmdline) mount_process = subprocess.Popen(cmdline)
@ -189,14 +194,15 @@ def test_notify_inval_entry(tmpdir, notify):
try: try:
os.stat(fname) os.stat(fname)
except FileNotFoundError: except FileNotFoundError:
# We may have hit a race condition # We may have hit a race condition and issued
# readdir just before the name changed
fname = pjoin(mnt_dir, os.listdir(mnt_dir)[0]) fname = pjoin(mnt_dir, os.listdir(mnt_dir)[0])
os.stat(fname) os.stat(fname)
safe_sleep(2) safe_sleep(4)
if not notify: if not notify:
os.stat(fname) os.stat(fname)
safe_sleep(4) safe_sleep(10)
with pytest.raises(FileNotFoundError): with pytest.raises(FileNotFoundError):
os.stat(fname) os.stat(fname)
except: except: