diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2020-05-22 09:15:27 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2020-05-22 09:15:27 +0100 |
commit | ee054db071170fadf4108d7b282d2e4518987d8d (patch) | |
tree | 06f652a51ab6ee670172fc230084590052b2483d /test/monkeyfarmer.py | |
parent | e6c666d4f432d51ff449bbd4dfd137107c9e774c (diff) | |
download | netsurf-ee054db071170fadf4108d7b282d2e4518987d8d.tar.gz netsurf-ee054db071170fadf4108d7b282d2e4518987d8d.tar.bz2 |
monkey: Excise sslcert and add loading blocking support
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'test/monkeyfarmer.py')
-rw-r--r-- | test/monkeyfarmer.py | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py index c24687680..905fd9a81 100644 --- a/test/monkeyfarmer.py +++ b/test/monkeyfarmer.py @@ -216,7 +216,6 @@ class Browser: wrapper=wrapper) self.windows = {} self.logins = {} - self.sslcerts = {} self.current_draw_target = None self.started = False self.stopped = False @@ -288,18 +287,6 @@ class Browser: if win.alive and win.ready: self.handle_ready_login(win) - def handle_SSLCERT(self, action, _lwin, winid, *args): - if action == "VERIFY": - new_win = SSLCertWindow(self, winid, *args) - self.sslcerts[winid] = new_win - self.handle_ready_sslcert(new_win) - else: - win = self.sslcerts.get(winid, None) - if win is None: - print(" Unknown ssl cert window id {}".format(winid)) - else: - win.handle(action, *args) - def handle_PLOT(self, *args): if self.current_draw_target is not None: self.current_draw_target.handle_plot(*args) @@ -322,44 +309,6 @@ class Browser: # Override this method to do useful stuff lwin.destroy() - def handle_ready_sslcert(self, cwin): - - # pylint: disable=locally-disabled, no-self-use - - # Override this method to do useful stuff - cwin.destroy() - - -class SSLCertWindow: - - # pylint: disable=locally-disabled, invalid-name - - def __init__(self, browser, winid, _url, *url): - self.alive = True - self.browser = browser - self.winid = winid - self.url = " ".join(url) - - def handle(self, action, _str="STR"): - if action == "DESTROY": - self.alive = False - else: - raise AssertionError("Unknown action {} for sslcert window".format(action)) - - def _wait_dead(self): - while self.alive: - self.browser.farmer.loop(once=True) - - def go(self): - assert self.alive - self.browser.farmer.tell_monkey("SSLCERT GO {}".format(self.winid)) - self._wait_dead() - - def destroy(self): - assert self.alive - self.browser.farmer.tell_monkey("SSLCERT DESTROY {}".format(self.winid)) - self._wait_dead() - class LoginWindow: @@ -680,9 +629,6 @@ def farmer_test(): lwin.send_password("bar") lwin.go() - def handle_ready_sslcert(self, cwin): - cwin.destroy() - fbbrowser = FooBarLogin(quiet=True) win = fbbrowser.new_window() win.load_page("https://httpbin.org/basic-auth/foo/bar") |