Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/ceefe452052c58ee092da5cdc9c505c3b84f0392
...commit
http://git.netsurf-browser.org/netsurf.git/commit/ceefe452052c58ee092da5cdc9c505c3b84f0392
...tree
http://git.netsurf-browser.org/netsurf.git/tree/ceefe452052c58ee092da5cdc9c505c3b84f0392
The branch, master has been updated
via ceefe452052c58ee092da5cdc9c505c3b84f0392 (commit)
from 1698a752827858125e3e4626168cdaa29f13d6d3 (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=ceefe452052c58ee092da5cdc9c505c3b84f0392
commit ceefe452052c58ee092da5cdc9c505c3b84f0392
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Enable running of the tests from test.netsurf-browser.org
diff --git a/test/monkey-driver.py b/test/monkey-driver.py
deleted file mode 100755
index 6463d96..0000000
--- a/test/monkey-driver.py
+++ /dev/null
@@ -1,331 +0,0 @@
-#!/usr/bin/python3
-
-import sys, getopt, yaml, time
-
-from monkeyfarmer import Browser
-
-class DriverBrowser(Browser):
- def __init__(self, *args, **kwargs):
- super(DriverBrowser, self).__init__(*args, **kwargs)
- self.auth = []
-
- def add_auth(self, url, realm, username, password):
- self.auth.append((url, realm, username, password))
-
- def remove_auth(self, url, realm, username, password):
- keep = []
- def matches(a,b):
- if a is None or b is None:
- return True
- return a == b
- for (iurl, irealm, iusername, ipassword) in self.auth:
- if not (matches(url, iurl) or
- matches(realm, irealm) or
- matches(username, iusername) or
- matches(password, ipassword)):
- keep.append((iurl, irealm, iusername, ipassword))
- self.auth = keep
-
- def handle_ready_login(self, logwin):
- # We have logwin.{url,username,password,realm}
- # We must logwin.send_{username,password}(xxx)
- # We may logwin.go()
- # We may logwin.destroy()
- def matches(a,b):
- if a is None or b is None:
- return True
- return a == b
- candidates = []
- for (url, realm, username, password) in self.auth:
- score = 0
- if matches(url, logwin.url):
- score += 1
- if matches(realm, logwin.realm):
- score += 1
- if matches(username, logwin.username):
- score += 1
- if score > 0:
- candidates.append((score, username, password))
- if candidates:
- candidates.sort()
- (score, username, password) = candidates[-1]
- print("401: Found candidate {}/{} with score {}".format(username,
password, score))
- logwin.send_username(username)
- logwin.send_password(password)
- logwin.go()
- else:
- print("401: No candidate found, cancelling login box")
- logwin.destroy()
-
-def print_usage():
- print('Usage:')
- print(' ' + sys.argv[0] + ' -m <path to monkey> -t <path to test>')
-
-def parse_argv(argv):
- path_monkey = ''
- path_test = ''
- try:
- opts, args = getopt.getopt(argv,"hm:t:",["monkey=","test="])
- except getopt.GetoptError:
- print_usage()
- sys.exit(2)
- for opt, arg in opts:
- if opt == '-h':
- print_usage()
- sys.exit()
- elif opt in ("-m", "--monkey"):
- path_monkey = arg
- elif opt in ("-t", "--test"):
- path_test = arg
-
- if path_monkey == '':
- print_usage()
- sys.exit()
- if path_test == '':
- print_usage()
- sys.exit()
-
- return path_monkey, path_test
-
-def load_test_plan(path):
- plan = []
- with open(path, 'r') as stream:
- try:
- plan = (yaml.load(stream))
- except:
- print (exc)
- return plan
-
-def get_indent(ctx):
- return ' ' * ctx["depth"];
-
-def print_test_plan_info(ctx, plan):
- print('Running test: [' + plan["group"] + '] ' + plan["title"])
-
-def assert_browser(ctx):
- assert(ctx['browser'].started)
- assert(not ctx['browser'].stopped)
-
-def conds_met(ctx, conds):
- for cond in conds:
- status = cond['status']
- window = cond['window']
- assert(status == "complete") # TODO: Add more status support?
- if window == "*all*":
- for win in ctx['windows'].items():
- if win[1].throbbing:
- return False
- else:
- win = ctx['windows'][window]
- if win.throbbing:
- return False
- return True
-
-def run_test_step_action_launch(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- assert(ctx.get('browser') is None)
- assert(ctx.get('windows') is None)
- ctx['browser'] = DriverBrowser(monkey_cmd=[ctx["monkey"]], quiet=True)
- assert_browser(ctx)
- ctx['windows'] = dict()
-
-def run_test_step_action_window_new(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- tag = step['tag']
- assert_browser(ctx)
- assert(ctx['windows'].get(tag) is None)
- ctx['windows'][tag] = ctx['browser'].new_window(url=step.get('url'))
-
-def run_test_step_action_window_close(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- assert_browser(ctx)
- tag = step['window']
- assert(ctx['windows'].get(tag) is not None)
- win = ctx['windows'].pop(tag)
- win.kill()
- win.wait_until_dead()
- assert(win.alive == False)
-
-def run_test_step_action_navigate(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- assert_browser(ctx)
- assert(step.get('url') is not None)
- tag = step['window']
- print(get_indent(ctx) + " " + tag + " --> " + step['url'])
- win = ctx['windows'].get(tag)
- assert(win is not None)
- win.go(step['url'])
-
-def run_test_step_action_sleep_ms(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- conds = step['conditions']
- sleep_time = step['time']
- sleep = 0
- have_repeat = False
- if isinstance(sleep_time, str):
- assert(ctx['repeats'].get(sleep_time) is not None)
- repeat = ctx['repeats'].get(sleep_time)
- sleep = repeat["i"] / 1000
- start = repeat["start"]
- have_repeat = True
- else:
- sleep = time / 1000
- start = time.time()
-
- while True:
- slept = time.time() - start
- if conds_met(ctx, conds):
- if have_repeat:
- ctx['repeats'][sleep_time]["loop"] = False
- print(get_indent(ctx) + " Condition met after
{}s".format(slept))
- break
- elif slept > sleep:
- print(get_indent(ctx) + " Condition not met after
{}s".format(sleep))
- break
- else:
- ctx['browser'].farmer.loop(once=True)
-
-def run_test_step_action_block(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- conds = step['conditions']
- assert_browser(ctx)
-
- while not conds_met(ctx, conds):
- ctx['browser'].farmer.loop(once=True)
-
-def run_test_step_action_repeat(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- tag = step['tag']
- assert(ctx['repeats'].get(tag) is None)
- ctx['repeats'][tag] = {
- "i": step["min"],
- "step": step["step"],
- "loop": True,
- }
- while ctx['repeats'][tag]["loop"]:
- ctx['repeats'][tag]["start"] = time.time()
- ctx["depth"] += 1
- for s in step["steps"]:
- run_test_step(ctx, s)
- ctx['repeats'][tag]["i"] += ctx['repeats'][tag]["step"]
- ctx["depth"] -= 1
-
-def run_test_step_action_plot_check(ctx, step):
- print(get_indent(ctx) + "Action: " + step["action"])
- assert_browser(ctx)
- win = ctx['windows'][step['window']]
- checks = step['checks']
- all_text = []
- bitmaps = []
- for plot in win.redraw():
- if plot[0] == 'TEXT':
- all_text.extend(plot[6:])
- if plot[0] == 'BITMAP':
- bitmaps.append(plot[1:])
- all_text = " ".join(all_text)
- for check in checks:
- if 'text-contains' in check.keys():
- print("Check {} in
{}".format(repr(check['text-contains']),repr(all_text)))
- assert(check['text-contains'] in all_text)
- elif 'text-not-contains' in check.keys():
- print("Check {} NOT in
{}".format(repr(check['text-not-contains']),repr(all_text)))
- assert(check['text-not-contains'] not in all_text)
- elif 'bitmap-count' in check.keys():
- assert(len(bitmaps) == int(check['bitmap-count']))
- else:
- raise AssertionError("Unknown check: {}".format(repr(check)))
-
-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_add_auth(ctx, step):
- print(get_indent(ctx) + "Action:" + step["action"])
- assert_browser(ctx)
- browser = ctx['browser']
- browser.add_auth(step.get("url"), step.get("realm"),
- step.get("username"), step.get("password"))
-
-
-def run_test_step_action_remove_auth(ctx, step):
- print(get_indent(ctx) + "Action:" + step["action"])
- assert_browser(ctx)
- browser = ctx['browser']
- browser.remove_auth(step.get("url"), step.get("realm"),
- step.get("username"), step.get("password"))
-
-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')
- assert(browser.quit_and_wait())
-
-step_handlers = {
- "launch": run_test_step_action_launch,
- "window-new": run_test_step_action_window_new,
- "window-close": run_test_step_action_window_close,
- "navigate": run_test_step_action_navigate,
- "sleep-ms": run_test_step_action_sleep_ms,
- "block": run_test_step_action_block,
- "repeat": run_test_step_action_repeat,
- "timer-start": run_test_step_action_timer_start,
- "timer-stop": run_test_step_action_timer_stop,
- "timer-check": run_test_step_action_timer_check,
- "plot-check": run_test_step_action_plot_check,
- "add-auth": run_test_step_action_add_auth,
- "remove-auth": run_test_step_action_remove_auth,
- "quit": run_test_step_action_quit,
-}
-
-def run_test_step(ctx, step):
- step_handlers[step["action"]](ctx, step)
-
-def walk_test_plan(ctx, plan):
- ctx["depth"] = 0
- ctx["timers"] = dict()
- ctx['repeats'] = dict()
- for step in plan["steps"]:
- run_test_step(ctx, step)
-
-
-def main(argv):
- ctx = {}
- path_monkey, path_test = parse_argv(argv)
- plan = load_test_plan(path_test)
- ctx["monkey"] = path_monkey
- print_test_plan_info(ctx, plan)
- walk_test_plan(ctx, plan)
-
-# Some python weirdness to get to main().
-if __name__ == "__main__":
- main(sys.argv[1:])
diff --git a/test/monkey-see-monkey-do b/test/monkey-see-monkey-do
new file mode 100755
index 0000000..2733e6f
--- /dev/null
+++ b/test/monkey-see-monkey-do
@@ -0,0 +1,71 @@
+#!/usr/bin/python3
+
+# If you have any poo, fling it now!
+
+BASE_PATH="https://test.netsurf-browser.org/cgi-bin/monkey-index.cgi";
+MONKEY_PATH="./nsmonkey"
+
+# Otherwise let's begin...
+
+import sys
+
+import yaml
+
+import multiprocessing as mp
+
+from urllib import request
+from io import StringIO
+
+import monkey_driver as driver
+
+mp.set_start_method('fork')
+
+def child_run_test(parts):
+ outcapture = StringIO()
+ errcapture = StringIO()
+ oldout = sys.stdout
+ olderr = sys.stderr
+ sys.stdout = outcapture
+ sys.stderr = errcapture
+ try:
+ driver.run_preloaded_test(MONKEY_PATH, parts)
+ except:
+ sys.stdout = oldout
+ sys.stderr = olderr
+ print("FAIL:")
+ print("STDOUT:\n{}\n", outcapture.getvalue())
+ print("STDERR:\n{}\n", errcapture.getvalue())
+ print("RERAISE:")
+ raise
+
+def run_test(parts):
+ p = mp.Process(target=child_run_test, args=(parts, ))
+ p.start()
+ p.join()
+ return p.exitcode
+
+
+print("Fetching tests...")
+index = request.urlopen(BASE_PATH)
+index = index.read()
+print("Parsing tests...")
+test_set = yaml.load_all(index)
+
+print("Running tests...")
+ret = 0
+for test in test_set:
+ if test["kind"] == 'group':
+ print("Start group: {}".format(test["group"]))
+ print(" => {}".format(test["description"]))
+ elif test["kind"] == 'test':
+ print(" => Run test: {}".format(test["filename"]))
+ ret = run_test(test["content"])
+ if ret != 0:
+ break
+
+if ret != 0:
+ print("FAIL")
+ sys.exit(1)
+else:
+ print("PASS")
+ sys.exit(0)
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
new file mode 100755
index 0000000..ee23cff
--- /dev/null
+++ b/test/monkey_driver.py
@@ -0,0 +1,338 @@
+#!/usr/bin/python3
+
+import sys, getopt, yaml, time
+
+from monkeyfarmer import Browser
+
+class DriverBrowser(Browser):
+ def __init__(self, *args, **kwargs):
+ super(DriverBrowser, self).__init__(*args, **kwargs)
+ self.auth = []
+
+ def add_auth(self, url, realm, username, password):
+ self.auth.append((url, realm, username, password))
+
+ def remove_auth(self, url, realm, username, password):
+ keep = []
+ def matches(a,b):
+ if a is None or b is None:
+ return True
+ return a == b
+ for (iurl, irealm, iusername, ipassword) in self.auth:
+ if not (matches(url, iurl) or
+ matches(realm, irealm) or
+ matches(username, iusername) or
+ matches(password, ipassword)):
+ keep.append((iurl, irealm, iusername, ipassword))
+ self.auth = keep
+
+ def handle_ready_login(self, logwin):
+ # We have logwin.{url,username,password,realm}
+ # We must logwin.send_{username,password}(xxx)
+ # We may logwin.go()
+ # We may logwin.destroy()
+ def matches(a,b):
+ if a is None or b is None:
+ return True
+ return a == b
+ candidates = []
+ for (url, realm, username, password) in self.auth:
+ score = 0
+ if matches(url, logwin.url):
+ score += 1
+ if matches(realm, logwin.realm):
+ score += 1
+ if matches(username, logwin.username):
+ score += 1
+ if score > 0:
+ candidates.append((score, username, password))
+ if candidates:
+ candidates.sort()
+ (score, username, password) = candidates[-1]
+ print("401: Found candidate {}/{} with score {}".format(username,
password, score))
+ logwin.send_username(username)
+ logwin.send_password(password)
+ logwin.go()
+ else:
+ print("401: No candidate found, cancelling login box")
+ logwin.destroy()
+
+def print_usage():
+ print('Usage:')
+ print(' ' + sys.argv[0] + ' -m <path to monkey> -t <path to test>')
+
+def parse_argv(argv):
+ path_monkey = ''
+ path_test = ''
+ try:
+ opts, args = getopt.getopt(argv,"hm:t:",["monkey=","test="])
+ except getopt.GetoptError:
+ print_usage()
+ sys.exit(2)
+ for opt, arg in opts:
+ if opt == '-h':
+ print_usage()
+ sys.exit()
+ elif opt in ("-m", "--monkey"):
+ path_monkey = arg
+ elif opt in ("-t", "--test"):
+ path_test = arg
+
+ if path_monkey == '':
+ print_usage()
+ sys.exit()
+ if path_test == '':
+ print_usage()
+ sys.exit()
+
+ return path_monkey, path_test
+
+def load_test_plan(path):
+ plan = []
+ with open(path, 'r') as stream:
+ try:
+ plan = (yaml.load(stream))
+ except:
+ print (exc)
+ return plan
+
+def get_indent(ctx):
+ return ' ' * ctx["depth"];
+
+def print_test_plan_info(ctx, plan):
+ print('Running test: [' + plan["group"] + '] ' + plan["title"])
+
+def assert_browser(ctx):
+ assert(ctx['browser'].started)
+ assert(not ctx['browser'].stopped)
+
+def conds_met(ctx, conds):
+ for cond in conds:
+ status = cond['status']
+ window = cond['window']
+ assert(status == "complete") # TODO: Add more status support?
+ if window == "*all*":
+ for win in ctx['windows'].items():
+ if win[1].throbbing:
+ return False
+ else:
+ win = ctx['windows'][window]
+ if win.throbbing:
+ return False
+ return True
+
+def run_test_step_action_launch(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ assert(ctx.get('browser') is None)
+ assert(ctx.get('windows') is None)
+ ctx['browser'] = DriverBrowser(monkey_cmd=[ctx["monkey"]], quiet=True)
+ assert_browser(ctx)
+ ctx['windows'] = dict()
+
+def run_test_step_action_window_new(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ tag = step['tag']
+ assert_browser(ctx)
+ assert(ctx['windows'].get(tag) is None)
+ ctx['windows'][tag] = ctx['browser'].new_window(url=step.get('url'))
+
+def run_test_step_action_window_close(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ assert_browser(ctx)
+ tag = step['window']
+ assert(ctx['windows'].get(tag) is not None)
+ win = ctx['windows'].pop(tag)
+ win.kill()
+ win.wait_until_dead()
+ assert(win.alive == False)
+
+def run_test_step_action_navigate(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ assert_browser(ctx)
+ assert(step.get('url') is not None)
+ tag = step['window']
+ print(get_indent(ctx) + " " + tag + " --> " + step['url'])
+ win = ctx['windows'].get(tag)
+ assert(win is not None)
+ win.go(step['url'])
+
+def run_test_step_action_sleep_ms(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ conds = step['conditions']
+ sleep_time = step['time']
+ sleep = 0
+ have_repeat = False
+ if isinstance(sleep_time, str):
+ assert(ctx['repeats'].get(sleep_time) is not None)
+ repeat = ctx['repeats'].get(sleep_time)
+ sleep = repeat["i"] / 1000
+ start = repeat["start"]
+ have_repeat = True
+ else:
+ sleep = time / 1000
+ start = time.time()
+
+ while True:
+ slept = time.time() - start
+ if conds_met(ctx, conds):
+ if have_repeat:
+ ctx['repeats'][sleep_time]["loop"] = False
+ print(get_indent(ctx) + " Condition met after
{}s".format(slept))
+ break
+ elif slept > sleep:
+ print(get_indent(ctx) + " Condition not met after
{}s".format(sleep))
+ break
+ else:
+ ctx['browser'].farmer.loop(once=True)
+
+def run_test_step_action_block(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ conds = step['conditions']
+ assert_browser(ctx)
+
+ while not conds_met(ctx, conds):
+ ctx['browser'].farmer.loop(once=True)
+
+def run_test_step_action_repeat(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ tag = step['tag']
+ assert(ctx['repeats'].get(tag) is None)
+ ctx['repeats'][tag] = {
+ "i": step["min"],
+ "step": step["step"],
+ "loop": True,
+ }
+ while ctx['repeats'][tag]["loop"]:
+ ctx['repeats'][tag]["start"] = time.time()
+ ctx["depth"] += 1
+ for s in step["steps"]:
+ run_test_step(ctx, s)
+ ctx['repeats'][tag]["i"] += ctx['repeats'][tag]["step"]
+ ctx["depth"] -= 1
+
+def run_test_step_action_plot_check(ctx, step):
+ print(get_indent(ctx) + "Action: " + step["action"])
+ assert_browser(ctx)
+ win = ctx['windows'][step['window']]
+ checks = step['checks']
+ all_text = []
+ bitmaps = []
+ for plot in win.redraw():
+ if plot[0] == 'TEXT':
+ all_text.extend(plot[6:])
+ if plot[0] == 'BITMAP':
+ bitmaps.append(plot[1:])
+ all_text = " ".join(all_text)
+ for check in checks:
+ if 'text-contains' in check.keys():
+ print("Check {} in
{}".format(repr(check['text-contains']),repr(all_text)))
+ assert(check['text-contains'] in all_text)
+ elif 'text-not-contains' in check.keys():
+ print("Check {} NOT in
{}".format(repr(check['text-not-contains']),repr(all_text)))
+ assert(check['text-not-contains'] not in all_text)
+ elif 'bitmap-count' in check.keys():
+ assert(len(bitmaps) == int(check['bitmap-count']))
+ else:
+ raise AssertionError("Unknown check: {}".format(repr(check)))
+
+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_add_auth(ctx, step):
+ print(get_indent(ctx) + "Action:" + step["action"])
+ assert_browser(ctx)
+ browser = ctx['browser']
+ browser.add_auth(step.get("url"), step.get("realm"),
+ step.get("username"), step.get("password"))
+
+
+def run_test_step_action_remove_auth(ctx, step):
+ print(get_indent(ctx) + "Action:" + step["action"])
+ assert_browser(ctx)
+ browser = ctx['browser']
+ browser.remove_auth(step.get("url"), step.get("realm"),
+ step.get("username"), step.get("password"))
+
+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')
+ assert(browser.quit_and_wait())
+
+step_handlers = {
+ "launch": run_test_step_action_launch,
+ "window-new": run_test_step_action_window_new,
+ "window-close": run_test_step_action_window_close,
+ "navigate": run_test_step_action_navigate,
+ "sleep-ms": run_test_step_action_sleep_ms,
+ "block": run_test_step_action_block,
+ "repeat": run_test_step_action_repeat,
+ "timer-start": run_test_step_action_timer_start,
+ "timer-stop": run_test_step_action_timer_stop,
+ "timer-check": run_test_step_action_timer_check,
+ "plot-check": run_test_step_action_plot_check,
+ "add-auth": run_test_step_action_add_auth,
+ "remove-auth": run_test_step_action_remove_auth,
+ "quit": run_test_step_action_quit,
+}
+
+def run_test_step(ctx, step):
+ step_handlers[step["action"]](ctx, step)
+
+def walk_test_plan(ctx, plan):
+ ctx["depth"] = 0
+ ctx["timers"] = dict()
+ ctx['repeats'] = dict()
+ for step in plan["steps"]:
+ run_test_step(ctx, step)
+
+def run_test_plan(ctx, plan):
+ print_test_plan_info(ctx, plan)
+ walk_test_plan(ctx, plan)
+
+def run_preloaded_test(path_monkey, plan):
+ ctx = {
+ "monkey": path_monkey,
+ }
+ run_test_plan(ctx, plan)
+
+def main(argv):
+ ctx = {}
+ path_monkey, path_test = parse_argv(argv)
+ plan = load_test_plan(path_test)
+ ctx["monkey"] = path_monkey
+
+# Some python weirdness to get to main().
+if __name__ == "__main__":
+ main(sys.argv[1:])
-----------------------------------------------------------------------
Summary of changes:
test/monkey-see-monkey-do | 71 +++++++++++++++++++++++++++
test/{monkey-driver.py => monkey_driver.py} | 11 ++++-
2 files changed, 80 insertions(+), 2 deletions(-)
create mode 100755 test/monkey-see-monkey-do
rename test/{monkey-driver.py => monkey_driver.py} (98%)
diff --git a/test/monkey-see-monkey-do b/test/monkey-see-monkey-do
new file mode 100755
index 0000000..2733e6f
--- /dev/null
+++ b/test/monkey-see-monkey-do
@@ -0,0 +1,71 @@
+#!/usr/bin/python3
+
+# If you have any poo, fling it now!
+
+BASE_PATH="https://test.netsurf-browser.org/cgi-bin/monkey-index.cgi";
+MONKEY_PATH="./nsmonkey"
+
+# Otherwise let's begin...
+
+import sys
+
+import yaml
+
+import multiprocessing as mp
+
+from urllib import request
+from io import StringIO
+
+import monkey_driver as driver
+
+mp.set_start_method('fork')
+
+def child_run_test(parts):
+ outcapture = StringIO()
+ errcapture = StringIO()
+ oldout = sys.stdout
+ olderr = sys.stderr
+ sys.stdout = outcapture
+ sys.stderr = errcapture
+ try:
+ driver.run_preloaded_test(MONKEY_PATH, parts)
+ except:
+ sys.stdout = oldout
+ sys.stderr = olderr
+ print("FAIL:")
+ print("STDOUT:\n{}\n", outcapture.getvalue())
+ print("STDERR:\n{}\n", errcapture.getvalue())
+ print("RERAISE:")
+ raise
+
+def run_test(parts):
+ p = mp.Process(target=child_run_test, args=(parts, ))
+ p.start()
+ p.join()
+ return p.exitcode
+
+
+print("Fetching tests...")
+index = request.urlopen(BASE_PATH)
+index = index.read()
+print("Parsing tests...")
+test_set = yaml.load_all(index)
+
+print("Running tests...")
+ret = 0
+for test in test_set:
+ if test["kind"] == 'group':
+ print("Start group: {}".format(test["group"]))
+ print(" => {}".format(test["description"]))
+ elif test["kind"] == 'test':
+ print(" => Run test: {}".format(test["filename"]))
+ ret = run_test(test["content"])
+ if ret != 0:
+ break
+
+if ret != 0:
+ print("FAIL")
+ sys.exit(1)
+else:
+ print("PASS")
+ sys.exit(0)
diff --git a/test/monkey-driver.py b/test/monkey_driver.py
similarity index 98%
rename from test/monkey-driver.py
rename to test/monkey_driver.py
index 6463d96..ee23cff 100755
--- a/test/monkey-driver.py
+++ b/test/monkey_driver.py
@@ -317,14 +317,21 @@ def walk_test_plan(ctx, plan):
for step in plan["steps"]:
run_test_step(ctx, step)
+def run_test_plan(ctx, plan):
+ print_test_plan_info(ctx, plan)
+ walk_test_plan(ctx, plan)
+
+def run_preloaded_test(path_monkey, plan):
+ ctx = {
+ "monkey": path_monkey,
+ }
+ run_test_plan(ctx, plan)
def main(argv):
ctx = {}
path_monkey, path_test = parse_argv(argv)
plan = load_test_plan(path_test)
ctx["monkey"] = path_monkey
- print_test_plan_info(ctx, plan)
- walk_test_plan(ctx, plan)
# Some python weirdness to get to main().
if __name__ == "__main__":
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
