[checkmk-commits] GUI-Tests: Fix option -W

Module: check_mk Branch: master Commit: d29c45b48043ca38f60ec4917d0c2838d3091bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29c45b48043ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 16:28:09 2015 +0100 GUI-Tests: Fix option -W --- doc/helpers/guitest | 1 - web/htdocs/guitester.py | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/helpers/guitest b/doc/helpers/guitest index 1009f23..bbe9825 100755 --- a/doc/helpers/guitest +++ b/doc/helpers/guitest @@ -320,7 +320,6 @@ def add_wait_step(args): wait_seconds = int(args[1]) / 1000.0 guitest[step_number+1:step_number+1] = [ { "wait" : wait_seconds } ] save_guitest(test_name, guitest) - add_special_step("wait", args) def add_reschedule_step(args): diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index 5a31050..a20eb1b 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -337,20 +337,21 @@ def page_reschedule_all(): raise MKAuthException(_("GUI Tests are disabled.")) html.header(_("Rescheduling and waiting for check results"), stylesheets=["status", "pages"]) - wait_for_pending("host", pending_hosts, 10) - wait_for_pending("service", pending_active_services, 50) + wait_for_pending("host", pending_hosts, 20) + wait_for_pending("service", pending_active_services, 100) html.footer() def wait_for_pending(what, generator_function, tries): + entries = generator_function() for try_number in range(tries): + for site, entry in entries: + html.live.command("[1231231233] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (what.upper(), entry, time.time()), sitename = site) + time.sleep(0.3) entries = generator_function() if not entries: html.message("All %ss are checked.\n" % what) break - for site, entry in entries: - html.live.command("[1231231233] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (what.upper(), entry, time.time()), sitename = site) - time.sleep(0.5) else: html.message("Reschedule failed after %d tries. Still pending %ss: %s\n" % (tries, what, ", ".join([e[1] for e in entries])))