Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

7023 FIX LDAP: User and group search filter can now contain non ASCII characters

by Lars Michelsen

Module: check_mk Branch: master Commit: 59c061dcecd0d746aaaaf034a72567a4154aeca2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59c061dcecd0d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 14:59:03 2019 +0100 7023 FIX LDAP: User and group search filter can now contain non ASCII characters Change-Id: Ica71454a2b7934b03a98292f191301bcab9a606b --- .werks/7023 | 11 +++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/7023 b/.werks/7023 new file mode 100644 index 0000000..f676f3f --- /dev/null +++ b/.werks/7023 @@ -0,0 +1,11 @@ +Title: LDAP: User and group search filter can now contain non ASCII characters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1546954389 + + diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 59b9e4b..0112061 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1645,7 +1645,7 @@ class LDAPConnectionValuespec(Transform): default_value="sub", )), ("user_filter", - TextAscii( + TextUnicode( title=_("Search Filter"), help= _("Using this option you can define an optional LDAP filter which is used during " @@ -1750,7 +1750,7 @@ class LDAPConnectionValuespec(Transform): default_value="sub", )), ("group_filter", - TextAscii( + TextUnicode( title=_("Search Filter"), help=_("Using this option you can define an optional LDAP filter which is used " "during group related LDAP searches. It can be used to only handle a "

5 years, 5 months

7000 FIX liebert.include: Fixed discovery of empty sensor names

by Simon Betz

Module: check_mk Branch: master Commit: 3fa6c4f962332251d75fc0b636a4460853232b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa6c4f9623322… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 8 14:57:11 2019 +0100 7000 FIX liebert.include: Fixed discovery of empty sensor names Change-Id: I6a56ca070a8fd62f3bbe4593f4f2ca7248f87d10 --- .werks/7000 | 10 ++++++++++ checks/.f12 | 1 + checks/liebert.include | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/7000 b/.werks/7000 new file mode 100644 index 0000000..3951f8c --- /dev/null +++ b/.werks/7000 @@ -0,0 +1,10 @@ +Title: liebert.include: Fixed discovery of empty sensor names +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1546955746 +Class: fix + + diff --git a/checks/.f12 b/checks/.f12 index be888b0..302a564 100755 --- a/checks/.f12 +++ b/checks/.f12 @@ -3,6 +3,7 @@ set -e SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} +SITE=heute2 ROOT=/omd/sites/$SITE echo "TARGET: $ROOT/share/check_mk/checks" diff --git a/checks/liebert.include b/checks/liebert.include index 61dadd0..57b4ada 100644 --- a/checks/liebert.include +++ b/checks/liebert.include @@ -45,6 +45,8 @@ def parse_liebert(info): elements = zip(line[0::3], line[1::3], line[2::3]) for element in elements: + if not element[0]: + continue name = get_item_name(element[0]) parsed[name] = [element[1], element[2]] @@ -73,6 +75,8 @@ def parse_liebert_without_unit(info): elements = zip(line[0::2], line[1::2]) for element in elements: + if not element[0]: + continue name = get_item_name(element[0]) parsed[name] = element[1]

5 years, 5 months

cpu util check parameters: a step towards consistency

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8cf2e7b4a246e565e279196af7d7509571ff5ec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf2e7b4a246e5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jan 8 10:55:54 2019 +0100 cpu util check parameters: a step towards consistency CMK-1297 Change-Id: I8c88a2dfc058667876a296e45de89cf5b54ef3e3 --- checks/bintec_cpu | 10 +-- checks/cisco_nexus_cpu | 2 +- checks/cpu_util.include | 4 +- checks/hr_cpu | 2 +- cmk/gui/plugins/wato/check_parameters/unsorted.py | 77 +++++++++++------------ 5 files changed, 48 insertions(+), 47 deletions(-) diff --git a/checks/bintec_cpu b/checks/bintec_cpu index b2a9b2c..6538c22 100644 --- a/checks/bintec_cpu +++ b/checks/bintec_cpu @@ -42,12 +42,12 @@ def check_bintec_cpu(_no_item, params, info): streams = float(info[0][2]) util = user + system + streams - for res in check_cpu_util(util, params): - state, infotext, perfdata = res - yield state, "total: %s" % infotext, perfdata + yield 0, "user: %.1f%%" % user + yield 0, "system: %.1f%%" % system + yield 0, "streams: %.1f%%" % streams, [("streams", streams)] - yield 0, "user: %.1f%%, system: %.1f%%, streams: %.1f%%" % \ - (user, system, streams), [ ("streams", "%.3f" % streams), ] + for res in check_cpu_util(util, params): + yield res check_info['bintec_cpu'] = { diff --git a/checks/cisco_nexus_cpu b/checks/cisco_nexus_cpu index 966bd08..8db0175 100644 --- a/checks/cisco_nexus_cpu +++ b/checks/cisco_nexus_cpu @@ -27,7 +27,7 @@ # .1.3.6.1.4.1.9.9.305.1.1.1.0 1 --> CISCO-SYSTEM-EXT-MIB::cseSysCPUUtilization.0 factory_settings["cisco_nexus_cpu_default_levels"] = { - 'levels': (80.0, 90.0), + 'util': (80.0, 90.0), } diff --git a/checks/cpu_util.include b/checks/cpu_util.include index f9deecd..631caf4 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -67,7 +67,9 @@ def check_cpu_util(util, params, this_time=None, cores=None): elif isinstance(params, tuple): params = {"levels": params} - levels = params.get("levels") + levels = params.get("util") + if levels is None: # legacy rules before 1.6 + levels = params.get("levels") # Averaging if "average" in params: diff --git a/checks/hr_cpu b/checks/hr_cpu index f1d6604..0e6f723 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -28,7 +28,7 @@ # .1.3.6.1.2.1.25.3.3.1.2.769 1 --> HOST-RESOURCES-MIB::hrProcessorLoad.769 factory_settings["hr_cpu_default_levels"] = { - "levels": (80.0, 90.0), + "util": (80.0, 90.0), } diff --git a/cmk/gui/plugins/wato/check_parameters/unsorted.py b/cmk/gui/plugins/wato/check_parameters/unsorted.py index e5c2153..36474c0 100644 --- a/cmk/gui/plugins/wato/check_parameters/unsorted.py +++ b/cmk/gui/plugins/wato/check_parameters/unsorted.py @@ -6063,6 +6063,18 @@ cpu_util_common_elements = [ ], help=_("Here you can set levels on the CPU utilization on single cores"), )), + ("util", + Levels( + title=_("Levels on total CPU utilization"), + unit="%", + default_levels=(90, 95), + default_difference=(5, 8), + default_value=None, + help=_("The CPU utilization sums up the percentages of CPU time that is used " + "for user processes, kernel routines (system), disk wait (sometimes also " + "called IO wait) or nothing (idle). The levels are always applied " + "on the average utiliazation since the last check - which is usually one minute."), + )), ("core_util_time_total", Tuple( title=_("Levels over an extended time period on total CPU utilization"), @@ -6102,35 +6114,36 @@ cpu_util_common_elements = [ "as well as devices monitored through the host-resource mib"))), ] + +def transform_legacy_cpu_utilization_os(params): + if "levels" in params: + params['util'] = params.pop('levels') + return params + + register_check_parameters( RulespecGroupCheckParametersOperatingSystem, "cpu_utilization_os", _("CPU utilization for simple devices"), - Dictionary( - help=_("This rule configures levels for the CPU utilization (not load) for " - "the operating systems Windows and VMWare ESX host systems, as well as devices " - "implementing the Host Resources MIB. The utilization " - "ranges from 0 to 100 - regardless of the number of CPUs."), - elements=[ - ("average", - Integer( - title=_("Averaging"), - help=_("When this option is activated then the CPU utilization is being " - "averaged <b>before</b> the levels are being applied."), - unit=_("minutes"), - minvalue=1, - default_value=15, - label=_("Compute average over last "), - )), - ("levels", - Levels( - title=_("Levels on total CPU utilization"), - unit="%", - default_levels=(85, 90), - default_difference=(5, 8), - default_value=None, - )), - ] + cpu_util_common_elements, + Transform( + Dictionary( + help=_("This rule configures levels for the CPU utilization (not load) for " + "the operating systems Windows and VMWare ESX host systems, as well as devices " + "implementing the Host Resources MIB. The utilization " + "ranges from 0 to 100 - regardless of the number of CPUs."), + elements=[ + ("average", + Integer( + title=_("Averaging"), + help=_("When this option is activated then the CPU utilization is being " + "averaged <b>before</b> the levels are being applied."), + unit=_("minutes"), + minvalue=1, + default_value=15, + label=_("Compute average over last "), + )), + ] + cpu_util_common_elements), + forth=transform_legacy_cpu_utilization_os, ), None, match_type="dict", @@ -6150,20 +6163,6 @@ register_check_parameters( _("CPU utilization on Linux/UNIX"), Transform( Dictionary(elements=[ - ("util", - Levels( - title=_("Levels on total CPU utilization"), - unit="%", - default_levels=(90, 95), - default_difference=(5, 8), - default_value=None, - help= - _("The CPU utilization sums up the percentages of CPU time that is used " - "for user processes, kernel routines (system), disk wait (sometimes also " - "called IO wait) or nothing (idle). The levels are always applied " - "on the average utiliazation since the last check - which is usually one minute." - ), - )), ("iowait", Tuple( title=_("Levels on disk wait (IO wait)"),

5 years, 5 months

agent_aws: Fixed missing exceptions section if empty results

by Simon Betz

Module: check_mk Branch: master Commit: a8c5f34411f86da1e1092a5622c896c7448257f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8c5f34411f86d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 8 13:41:15 2019 +0100 agent_aws: Fixed missing exceptions section if empty results Change-Id: I167c49b062d721f7a0f815bc55787ef61c8370b2 --- agents/special/agent_aws | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4b7000f..49b2ef7 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -931,10 +931,6 @@ class AWSSections(object): else: self._results.setdefault((section.name, section.interval), result) - if not self._results: - logging.info("No results or cached data") - return - self._write_exceptions() self._write_section_results(now) @@ -973,6 +969,10 @@ class AWSSections(object): sys.stdout.write("%s\n" % out) def _write_section_results(self, now): + if not self._results: + logging.info("No results or cached data") + return + for (section_name, section_interval), result in self._results.iteritems(): if not result: logging.info("No results of %s", section_name)

5 years, 5 months

agent_aws: describe AWS/CloudTrails

by Simon Betz

Module: check_mk Branch: master Commit: c017c8cd676d5fcf02e609474484e5bb97d8664f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c017c8cd676d5f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 21 14:18:18 2018 +0100 agent_aws: describe AWS/CloudTrails Change-Id: Ia4aa8ead4852e8986a2367b91c11d44beff2b736 --- agents/special/agent_aws | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 49b2ef7..7298f38 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -828,13 +828,23 @@ class CloudTrail(AWSSection): return 300 def _get_raw_result(self): - pass + response = self._client.describe_trails() + try: + trails = {trail['Name']: trail for trail in response['trailList']} + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + trails = {} + + for trail_name, trail in trails.iteritems(): + response = self._client.get_trail_status(Name=trail_name) + trail['Status'] = response + return trails def _extract_content_from(self, raw_result): - pass + return raw_result def _format_content(self, content): - pass + return [AWSSectionResult("", content)] #. @@ -861,6 +871,7 @@ class AWSSections(object): ec2_client = self._init_client('ec2') s3_client = self._init_client('s3') elb_client = self._init_client('elb') + cloudtrail_client = self._init_client('cloudtrail') cloudwatch_client = self._init_client('cloudwatch') #---distributors---------------------------------------------------- @@ -877,6 +888,7 @@ class AWSSections(object): s3 = S3(s3_client) elb_health = ELBHealth(elb_client) ce = CostsAndUsage(ce_client) + cloudtrail = CloudTrail(cloudtrail_client) ec2 = EC2(cloudwatch_client) elb = ELB(cloudwatch_client) ebs = EBS(cloudwatch_client) @@ -901,6 +913,7 @@ class AWSSections(object): self._sections.append(elb_health) self._sections.append(elb) self._sections.append(ebs) + self._sections.append(cloudtrail) def _init_client(self, client_key): try:

5 years, 5 months

Fix test_start_job() test

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b8fd23f8db69985870e9cd3346696bcc2f468d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b8fd23f8db699… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 8 13:24:40 2019 +0100 Fix test_start_job() test Change-Id: I459a434e713e902cad6b33d6764510d9cc9d0463 --- tests/unit/cmk/gui/test_background_job.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk/gui/test_background_job.py b/tests/unit/cmk/gui/test_background_job.py index cd07c85..6470e66 100644 --- a/tests/unit/cmk/gui/test_background_job.py +++ b/tests/unit/cmk/gui/test_background_job.py @@ -1,5 +1,5 @@ import time -import signal +import multiprocessing import sys import pytest # type: ignore from pathlib2 import Path @@ -46,12 +46,14 @@ class DummyBackgroundJob(gui_background_job.GUIBackgroundJob): kwargs["title"] = self.gui_title kwargs["deletable"] = False kwargs["stoppable"] = True + self.finish_hello_event = multiprocessing.Event() super(DummyBackgroundJob, self).__init__(self.job_prefix, **kwargs) def execute_hello(self, job_interface): sys.stdout.write("Hallo :-)\n") sys.stdout.flush() + self.finish_hello_event.wait() def execute_endless(self): sys.stdout.write("Hanging loop\n") @@ -67,13 +69,14 @@ def test_start_job(): assert status["state"] == background_job.JobStatus.state_initialized job.start() - time.sleep(1) assert job.is_running() with pytest.raises(background_job.BackgroundJobAlreadyRunning): job.start() assert job.is_running() + job.finish_hello_event.set() + testlib.wait_until( lambda: job.get_status()["state"] not in [ background_job.JobStatus.state_initialized, background_job.JobStatus.state_running ], timeout=5,

5 years, 5 months

Refresh package-lock.json

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d535aa9dfeaf98a86d9295bd3d65ac77dbd6ea0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d535aa9dfeaf98… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jan 8 10:10:30 2019 +0100 Refresh package-lock.json Change-Id: Ib7f6aba57b77b8acd27bb599c552e25cdd9de0bb --- package-lock.json | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68285f4..19522cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2530,12 +2530,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2550,17 +2552,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2677,7 +2682,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2689,6 +2695,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2703,6 +2710,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2710,12 +2718,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2734,6 +2744,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2814,7 +2825,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2826,6 +2838,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2947,6 +2960,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",

5 years, 5 months

Minor cleanup in TextAscii

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b669194f112e35eb5195a366a68d6fe5b54fab75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b669194f112e35… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jan 8 10:11:20 2019 +0100 Minor cleanup in TextAscii Change-Id: I189808d6803d4da7226362a99a835e4c6affc7ea --- cmk/gui/valuespec.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index e1d7b38..f3d8622 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -440,19 +440,13 @@ class TextAscii(ValueSpec): def render_input(self, varprefix, value): self.classtype_info() - if value is None: - value = "" - else: - value = "%s" % value + value_text = "%s" % value if value is not None else "" if self._label: html.write(self._label) html.nbsp() - if self._hidden: - type_ = "password" - else: - type_ = "text" + type_ = "password" if self._hidden else "text" attrs = {} if self._onkeyup: @@ -460,7 +454,7 @@ class TextAscii(ValueSpec): html.text_input( varprefix, - value, + value_text, size=self._size, try_max_width=self._try_max_width, read_only=self._read_only,

5 years, 5 months

agent_kubernetes: add option to specify a custom URL prefix

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7f81c5f81492a9b74536d902f2e04614e7cbdf1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f81c5f81492a9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jan 8 10:13:49 2019 +0100 agent_kubernetes: add option to specify a custom URL prefix CMK-1478 Change-Id: I900735df01f3ab45d5cf685019cded6be6c0d1e3 --- agents/special/agent_kubernetes | 6 +++++- checks/agent_kubernetes | 5 ++++- cmk/gui/plugins/wato/datasource_programs.py | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_kubernetes b/agents/special/agent_kubernetes index 49e3600..a974f9b 100755 --- a/agents/special/agent_kubernetes +++ b/agents/special/agent_kubernetes @@ -66,6 +66,7 @@ def parse(args): p.add_argument('host', metavar='HOST', help='Kubernetes host to connect to') p.add_argument('--port', type=int, default=443, help='Port to connect to') p.add_argument('--token', required=True, help='Token for that user') + p.add_argument('--url-prefix', help='Custom URL prefix for Kubernetes API calls') p.add_argument('--no-cert-check', action='store_true', help='Disable certificate verification') p.add_argument( '--profile', @@ -648,7 +649,10 @@ def get_api_client(arguments): logging.info('Constructing API client') config = client.Configuration() - config.host = 'https://%s:%s' % (arguments.host, arguments.port) + if arguments.url_prefix: + config.host = '%s:%s' % (arguments.url_prefix, arguments.port) + else: + config.host = 'https://%s:%s' % (arguments.host, arguments.port) config.api_key_prefix['authorization'] = 'Bearer' config.api_key['authorization'] = arguments.token diff --git a/checks/agent_kubernetes b/checks/agent_kubernetes index 6fedf8c..a439ed4 100644 --- a/checks/agent_kubernetes +++ b/checks/agent_kubernetes @@ -31,9 +31,12 @@ def agent_kubernetes_arguments(params, _hostname, ipaddress): if "port" in params: args += ["--port", str(params["port"])] - if params.get("no-cert-check"): + if "no-cert-check" in params: args += ["--no-cert-check"] + if "url-prefix" in params: + args += ["--url-prefix", params["url-prefix"]] + args += [ipaddress] return args diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index da8d74e..b0f8e4c 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -116,6 +116,7 @@ register_rule( allow_empty=False, )), ("port", Integer(title=_(u"Port"), default_value=443)), + ("url-prefix", HTTPUrl(title=_("Custom URL prefix"), allow_empty=False)), ("no-cert-check", Alternative( title=_("Disable certificate verification"), @@ -125,7 +126,7 @@ register_rule( ], default_value=False)), ], - optional_keys=["port", "no-cert-check"], + optional_keys=["port", "url-prefix", "no-cert-check"], ), match="first", title=_(u"Kubernetes"),

5 years, 5 months

Bumped sleeping time again.

by Sven Panne

Module: check_mk Branch: master Commit: 3321d1bf2ce2beb7e5345dd14e1c96f71d40a95b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3321d1bf2ce2be… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 8 12:52:06 2019 +0100 Bumped sleeping time again. test_start_job should *really* be fixed and the sleep hack should be removed... :-/ Change-Id: Ie5fe763fb6d33126e541cf38fd1a9ac93db05091 --- tests/unit/cmk/gui/test_background_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/cmk/gui/test_background_job.py b/tests/unit/cmk/gui/test_background_job.py index fadd6a0..cd07c85 100644 --- a/tests/unit/cmk/gui/test_background_job.py +++ b/tests/unit/cmk/gui/test_background_job.py @@ -67,7 +67,7 @@ def test_start_job(): assert status["state"] == background_job.JobStatus.state_initialized job.start() - time.sleep(0.2) + time.sleep(1) assert job.is_running() with pytest.raises(background_job.BackgroundJobAlreadyRunning):

5 years, 5 months

← Newer
1
...
40
41
42
43
44
45
46
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019