Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/eae3756c557e1481f6c4e1be896e5070e63d4b34
...commit
http://git.netsurf-browser.org/netsurf.git/commit/eae3756c557e1481f6c4e1be896e5070e63d4b34
...tree
http://git.netsurf-browser.org/netsurf.git/tree/eae3756c557e1481f6c4e1be896e5070e63d4b34
The branch, master has been updated
via eae3756c557e1481f6c4e1be896e5070e63d4b34 (commit)
from cf798ba79ae2b518a8775707ac9ccf90709ce949 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=eae3756c557e1481f6c4e1be896e5070e63d4b34
commit eae3756c557e1481f6c4e1be896e5070e63d4b34
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
monkey_driver: Unbreak window condition code so timeouts can happen
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 5074640..606530e 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -173,17 +173,19 @@ def conds_met(ctx, conds):
window = cond['window']
assert status == "complete" or status == "loading" # TODO: Add
more status support?
if window == "*all*":
- # all windows must be not throbbing
+ # all windows must be complete, or any still loading
throbbing = False
for win in ctx['windows'].items():
if win[1].throbbing:
throbbing = True
# throbbing and want loading => true
# not throbbing and want complete => true
- return (status == "loading") == throbbing
+ if (status == "loading") == throbbing:
+ return True
else:
win = ctx['windows'][window]
- return win.throbbing == (status == "loading")
+ if win.throbbing == (status == "loading"):
+ return True
else:
raise AssertionError("Unknown condition: {}".format(repr(cond)))
-----------------------------------------------------------------------
Summary of changes:
test/monkey_driver.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 5074640..606530e 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -173,17 +173,19 @@ def conds_met(ctx, conds):
window = cond['window']
assert status == "complete" or status == "loading" # TODO: Add
more status support?
if window == "*all*":
- # all windows must be not throbbing
+ # all windows must be complete, or any still loading
throbbing = False
for win in ctx['windows'].items():
if win[1].throbbing:
throbbing = True
# throbbing and want loading => true
# not throbbing and want complete => true
- return (status == "loading") == throbbing
+ if (status == "loading") == throbbing:
+ return True
else:
win = ctx['windows'][window]
- return win.throbbing == (status == "loading")
+ if win.throbbing == (status == "loading"):
+ return True
else:
raise AssertionError("Unknown condition: {}".format(repr(cond)))
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
