From c74c8332acc3e323565281f3f2774bf088a6a882 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 6 Jun 2019 17:16:23 +0100 Subject: allow monkey tests to stop navigation --- test/monkey_driver.py | 9 +++++++++ test/monkeyfarmer.py | 3 +++ 2 files changed, 12 insertions(+) diff --git a/test/monkey_driver.py b/test/monkey_driver.py index 30570942e..16f286a5f 100755 --- a/test/monkey_driver.py +++ b/test/monkey_driver.py @@ -235,6 +235,14 @@ def run_test_step_action_navigate(ctx, step): assert(win is not None) win.go(step['url']) +def run_test_step_action_stop(ctx, step): + print(get_indent(ctx) + "Action: " + step["action"]) + assert_browser(ctx) + tag = step['window'] + win = ctx['windows'].get(tag) + assert(win is not None) + win.stop() + def run_test_step_action_sleep_ms(ctx, step): print(get_indent(ctx) + "Action: " + step["action"]) conds = step['conditions'] @@ -438,6 +446,7 @@ step_handlers = { "window-new": run_test_step_action_window_new, "window-close": run_test_step_action_window_close, "navigate": run_test_step_action_navigate, + "stop": run_test_step_action_stop, "sleep-ms": run_test_step_action_sleep_ms, "block": run_test_step_action_block, "repeat": run_test_step_action_repeat, diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py index 539fab597..08465f842 100644 --- a/test/monkeyfarmer.py +++ b/test/monkeyfarmer.py @@ -359,6 +359,9 @@ class BrowserWindow: self.winid, url, referer)) self.wait_start_loading() + def stop(self): + self.browser.farmer.tell_monkey("WINDOW STOP %s" % (self.winid)) + def reload(self): self.browser.farmer.tell_monkey("WINDOW RELOAD %s" % self.winid) -- cgit v1.2.3