From c90bd806a68a4d5e80ff985ad626e14cc8605204 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 12 Jun 2019 22:45:07 +0100
Subject: make the timer-start and timer-restart action name the timer in the
 same way

---
 test/monkey-tests/cache-test.yaml |  4 ++--
 test/monkey_driver.py             | 32 +++++++++++++++++---------------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/monkey-tests/cache-test.yaml b/test/monkey-tests/cache-test.yaml
index d8c4571df..372c5a1ba 100644
--- a/test/monkey-tests/cache-test.yaml
+++ b/test/monkey-tests/cache-test.yaml
@@ -4,7 +4,7 @@ steps:
 - action: launch
   language: en
 - action: timer-start
-  tag: timer1
+  timer: timer1
 - action: window-new
   tag: win1
 - action: navigate
@@ -17,7 +17,7 @@ steps:
 - action: timer-stop
   timer: timer1
 - action: timer-start
-  tag: timer2
+  timer: timer2
 - action: window-new
   tag: win2
 - action: navigate
diff --git a/test/monkey_driver.py b/test/monkey_driver.py
index 16f286a5f..03906d805 100755
--- a/test/monkey_driver.py
+++ b/test/monkey_driver.py
@@ -301,7 +301,10 @@ 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']
+    if 'checks' in step.keys():
+        checks = step['checks']
+    else:
+        checks = {}
     all_text = []
     bitmaps = []
     for plot in win.redraw():
@@ -310,23 +313,22 @@ def run_test_step_action_plot_check(ctx, step):
         if plot[0] == 'BITMAP':
             bitmaps.append(plot[1:])
     all_text = " ".join(all_text)
-    if checks is not None:
-        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():
-                print("Check bitmap count is {}".format(int(check['bitmap-count'])))
-                assert(len(bitmaps) == int(check['bitmap-count']))
-            else:
-                raise AssertionError("Unknown check: {}".format(repr(check)))
+    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():
+            print("Check bitmap count is {}".format(int(check['bitmap-count'])))
+            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']
+    tag = step['timer']
     assert_browser(ctx)
     assert(ctx['timers'].get(tag) is None)
     ctx['timers'][tag] = {}
-- 
cgit v1.2.3