mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 04:57:54 +00:00
Ignore IOErrors while we're still waiting
This commit is contained in:
parent
a0fc80d544
commit
b2628b0826
@ -7,13 +7,17 @@ def await_file_contents(path, contents, timeout=10):
|
||||
while time.time() - start_time < timeout:
|
||||
print(" waiting for '{}'".format(path))
|
||||
if exists(path):
|
||||
with open(path, 'r') as f:
|
||||
current = f.read()
|
||||
if current == contents:
|
||||
return True
|
||||
print(" file contents still mismatched")
|
||||
print(" wanted: {}".format(contents.replace('\n', ' ')))
|
||||
print(" got: {}".format(current.replace('\n', ' ')))
|
||||
try:
|
||||
with open(path, 'r') as f:
|
||||
current = f.read()
|
||||
except IOError:
|
||||
print("IOError; trying again")
|
||||
else:
|
||||
if current == contents:
|
||||
return True
|
||||
print(" file contents still mismatched")
|
||||
print(" wanted: {}".format(contents.replace('\n', ' ')))
|
||||
print(" got: {}".format(current.replace('\n', ' ')))
|
||||
time.sleep(1)
|
||||
if exists(path):
|
||||
raise Exception("Contents of '{}' mismatched after {}s".format(path, timeout))
|
||||
|
Loading…
Reference in New Issue
Block a user