integration test fixups

This commit is contained in:
meejah
2018-04-22 01:07:22 -06:00
parent fbc142d346
commit 41e6ec0fff
2 changed files with 17 additions and 13 deletions

View File

@ -257,7 +257,9 @@ def await_files_exist(paths, timeout=15, await_all=False):
if found:
return found
time.sleep(1)
raise Exception("Didn't find any of {} after {}s".format(', '.join(paths), timeout))
if await_all:
raise Exception("Didn't find {} after {}s".format(' and '.join(paths), timeout))
raise Exception("Didn't find {} after {}s".format(' or '.join(paths), timeout))
def await_file_vanishes(path, timeout=10):