mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-26 08:19:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix block conditional checks to be orred instead of anded

Browse Source
This commit is contained in:
Vincent Sanders 2019-05-20 10:07:53 +01:00
parent ea9bc4e2be
commit 12bba5a1cc
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/monkey_driver.py
View File

@ -107,30 +107,37 @@ def assert_browser(ctx):
assert(not ctx['browser'].stopped)
def conds_met(ctx, conds):
# for each condition listed determine if they have been met
# efectively this is condition1 | condition2
for cond in conds:
if 'window' in cond.keys():
status = cond['status']
window = cond['window']
assert(status == "complete") # TODO: Add more status support?
if window == "*all*":
for win in ctx['windows'].items():
if win[1].throbbing:
return False
else:
win = ctx['windows'][window]
if win.throbbing:
return False
elif 'timer' in cond.keys():
if 'timer' in cond.keys():
timer = cond['timer']
elapsed = cond['elapsed']
assert_browser(ctx)
assert(ctx['timers'].get(timer) is not None)
taken = time.time() - ctx['timers'][timer]["start"]
assert(taken < elapsed)
if (taken >= elapsed):
return True
elif 'window' in cond.keys():
status = cond['status']
window = cond['window']
assert(status == "complete") # TODO: Add more status support?
if window == "*all*":
# all windows must be not throbbing
throbbing = False
for win in ctx['windows'].items():
if win[1].throbbing:
throbbing = True
if not throbbing:
return True
else:
win = ctx['windows'][window]
if win.throbbing is False:
return True
else:
raise AssertionError("Unknown condition: {}".format(repr(cond)))
return True
return False
def run_test_step_action_launch(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
@ -265,6 +272,9 @@ def run_test_step_action_timer_restart(ctx, step):
timer = step['timer']
assert_browser(ctx)
assert(ctx['timers'].get(timer) is not None)
taken = time.time() - ctx['timers'][timer]["start"]
print(get_indent(ctx) + " {} restarted at: {:.2f}s".format(timer, taken))
ctx['timers'][timer]["taken"] = taken
ctx['timers'][timer]["start"] = time.time()
def run_test_step_action_timer_stop(ctx, step):