diff options
| author |  Nikolaus Rath <Nikolaus@rath.org> | 2016-10-09 20:49:41 -0700 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2016-10-09 22:03:07 -0700 |
| commit | cf4159156ba08694feb2d75773ec49e25e8ba4fb (patch) | |
| tree | a5dc270b9112da0a1e01bf42f1aa2b04d8e14826 /test | |
| parent | 7e562d59d4a64a14ff070bfd649de828534532e8 (diff) | |
Increase timeouts in notify_* tests
When running under Valgrind, we otherwise get sporadic test failures.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test_examples.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/test_examples.py b/test/test_examples.py index 9d83ae9..048c240 100755 --- a/test/test_examples.py +++ b/test/test_examples.py @@ -151,16 +151,21 @@ def test_notify1(tmpdir, name, options, notify): mnt_dir = str(tmpdir) cmdline = base_cmdline + \ [ pjoin(basename, 'example', name), - '-f', '--update-interval=1', mnt_dir ] + options + '-f', '--update-interval=2', mnt_dir ] + options if not notify: cmdline.append('--no-notify') mount_process = subprocess.Popen(cmdline) try: wait_for_mount(mount_process, mnt_dir) filename = pjoin(mnt_dir, 'current_time') - with open(filename, 'r') as fh: - read1 = fh.read() - safe_sleep(2) + # Wait until first update + while True: + with open(filename, 'r') as fh: + read1 = fh.read() + if read1: + break + safe_sleep(2) + safe_sleep(6) with open(filename, 'r') as fh: read2 = fh.read() if notify: @@ -179,7 +184,7 @@ def test_notify_inval_entry(tmpdir, notify): cmdline = base_cmdline + \ [ pjoin(basename, 'example', 'notify_inval_entry'), '-f', '--update-interval=2', - '--timeout=4', mnt_dir ] + '--timeout=10', mnt_dir ] if not notify: cmdline.append('--no-notify') mount_process = subprocess.Popen(cmdline) @@ -189,14 +194,15 @@ def test_notify_inval_entry(tmpdir, notify): try: os.stat(fname) 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]) os.stat(fname) - safe_sleep(2) + safe_sleep(4) if not notify: os.stat(fname) - safe_sleep(4) + safe_sleep(10) with pytest.raises(FileNotFoundError): os.stat(fname) except: |