Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/54be19e6c8d7bdb5530af2eb597d65802796b555
...commit
http://git.netsurf-browser.org/netsurf.git/commit/54be19e6c8d7bdb5530af2eb597d65802796b555
...tree
http://git.netsurf-browser.org/netsurf.git/tree/54be19e6c8d7bdb5530af2eb597d65802796b555
The branch, master has been updated
via 54be19e6c8d7bdb5530af2eb597d65802796b555 (commit)
from 46b6b7c9b4dcad989f8451638753594b572f9f9a (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=54be19e6c8d7bdb5530af2eb597d65802796b555
commit 54be19e6c8d7bdb5530af2eb597d65802796b555
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Test: Monkey driver: Add support for timer actions.
diff --git a/test/monkey-driver.py b/test/monkey-driver.py
index eed7da0..c49da12 100755
--- a/test/monkey-driver.py
+++ b/test/monkey-driver.py
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-import sys, getopt, yaml
+import sys, getopt, yaml, time
from monkeyfarmer import Browser
@@ -60,6 +60,7 @@ def run_test_step_action_launch(ctx, step):
ctx['browser'] = Browser(monkey_cmd=[ctx["monkey"]], quiet=True)
assert_browser(ctx)
ctx['windows'] = dict()
+ ctx['timers'] = dict()
def run_test_step_action_window_new(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
@@ -143,18 +144,43 @@ def run_test_step_action_plot_check(ctx, step):
def run_test_step_action_timer_start(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ tag = step['tag']
+ assert_browser(ctx)
+ assert(ctx['timers'].get(tag) is None)
+ ctx['timers'][tag] = {}
+ ctx['timers'][tag]["start"] = time.time()
def run_test_step_action_timer_stop(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ 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) + " " + timer + " took: " + str(taken) + "s")
+ ctx['timers'][timer]["taken"] = taken
def run_test_step_action_timer_check(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ condition = step["condition"].split()
+ assert(len(condition) == 3)
+ timer1 = ctx['timers'].get(condition[0])
+ timer2 = ctx['timers'].get(condition[2])
+ assert(timer1 is not None)
+ assert(timer2 is not None)
+ assert(timer1["taken"] is not None)
+ assert(timer2["taken"] is not None)
+ assert(condition[1] in ('<', '>'))
+ if condition[1] == '<':
+ assert(timer1["taken"] < timer2["taken"])
+ elif condition[1] == '>':
+ assert(timer1["taken"] > timer2["taken"])
def run_test_step_action_quit(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
assert_browser(ctx)
browser = ctx.pop('browser')
windows = ctx.pop('windows')
+ timers = ctx.pop('timers')
assert(browser.quit_and_wait())
step_handlers = {
-----------------------------------------------------------------------
Summary of changes:
test/monkey-driver.py | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/test/monkey-driver.py b/test/monkey-driver.py
index eed7da0..c49da12 100755
--- a/test/monkey-driver.py
+++ b/test/monkey-driver.py
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-import sys, getopt, yaml
+import sys, getopt, yaml, time
from monkeyfarmer import Browser
@@ -60,6 +60,7 @@ def run_test_step_action_launch(ctx, step):
ctx['browser'] = Browser(monkey_cmd=[ctx["monkey"]], quiet=True)
assert_browser(ctx)
ctx['windows'] = dict()
+ ctx['timers'] = dict()
def run_test_step_action_window_new(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
@@ -143,18 +144,43 @@ def run_test_step_action_plot_check(ctx, step):
def run_test_step_action_timer_start(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ tag = step['tag']
+ assert_browser(ctx)
+ assert(ctx['timers'].get(tag) is None)
+ ctx['timers'][tag] = {}
+ ctx['timers'][tag]["start"] = time.time()
def run_test_step_action_timer_stop(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ 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) + " " + timer + " took: " + str(taken) + "s")
+ ctx['timers'][timer]["taken"] = taken
def run_test_step_action_timer_check(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
+ condition = step["condition"].split()
+ assert(len(condition) == 3)
+ timer1 = ctx['timers'].get(condition[0])
+ timer2 = ctx['timers'].get(condition[2])
+ assert(timer1 is not None)
+ assert(timer2 is not None)
+ assert(timer1["taken"] is not None)
+ assert(timer2["taken"] is not None)
+ assert(condition[1] in ('<', '>'))
+ if condition[1] == '<':
+ assert(timer1["taken"] < timer2["taken"])
+ elif condition[1] == '>':
+ assert(timer1["taken"] > timer2["taken"])
def run_test_step_action_quit(ctx, step):
print(get_indent(ctx) + "Action: " + step["action"])
assert_browser(ctx)
browser = ctx.pop('browser')
windows = ctx.pop('windows')
+ timers = ctx.pop('timers')
assert(browser.quit_and_wait())
step_handlers = {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
