diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-02 12:24:14 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-02 12:24:14 +0100 |
| commit | 5c9d54d05b35f3f06261f8bf9c3a48d2293df767 (patch) | |
| tree | 4caedea58a268d82a5bff5d50b8356c7e7145136 /test | |
| parent | 095a0639d30b2683e028d632379bf7f7ac1ae6ae (diff) | |
| download | netsurf-5c9d54d05b35f3f06261f8bf9c3a48d2293df767.tar.gz netsurf-5c9d54d05b35f3f06261f8bf9c3a48d2293df767.tar.bz2 | |
Monkey: Properly support reload in farmer and driver
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/monkey_driver.py | 10 | ||||
| -rw-r--r-- | test/monkeyfarmer.py | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/test/monkey_driver.py b/test/monkey_driver.py index 18d915f40..7a1bd7972 100755 --- a/test/monkey_driver.py +++ b/test/monkey_driver.py @@ -299,6 +299,15 @@ def run_test_step_action_stop(ctx, step): win.stop() +def run_test_step_action_reload(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.reload() + + def run_test_step_action_sleep_ms(ctx, step): print(get_indent(ctx) + "Action: " + step["action"]) conds = step['conditions'] @@ -540,6 +549,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, + "reload": run_test_step_action_reload, "stop": run_test_step_action_stop, "sleep-ms": run_test_step_action_sleep_ms, "block": run_test_step_action_block, diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py index e4c654364..f6497fa10 100644 --- a/test/monkeyfarmer.py +++ b/test/monkeyfarmer.py @@ -426,8 +426,10 @@ class BrowserWindow: 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) + def reload(self, all=False): + all = " ALL" if all else "" + self.browser.farmer.tell_monkey("WINDOW RELOAD %s%s" % (self.winid, all)) + self.wait_start_loading() def js_exec(self, src): self.browser.farmer.tell_monkey("WINDOW EXEC WIN %s %s" % (self.winid, src)) |