Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Fixed unit tests after 51843cc9558ae2eeb9f886830784c40670c18af5

by Lars Michelsen

Module: check_mk Branch: master Commit: 16fe6197e389d4dc9ce0b3a41999d555897deecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16fe6197e389d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 16:09:18 2018 +0100 Fixed unit tests after 51843cc9558ae2eeb9f886830784c40670c18af5 Change-Id: I6428d32056f6cf3fe51a8252711570cbea62f6bd --- tests/git/test_permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index db43a85..33c5a43 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -28,7 +28,7 @@ permissions = [ ('enterprise/bin/*', is_executable, []), ('enterprise/active_checks/*', is_executable, []), ('enterprise/agents/bakery/*', is_not_executable, []), - ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make", "chroot", "src", "cmk_update_agent.pyc"]), + ('enterprise/agents/plugins/*', is_executable, ["chroot_version", "Makefile", "pyinstaller-deps.make", "chroot", "src", "cmk_update_agent.pyc", "pip-deps-32.make", "pip-deps.make"]), ('enterprise/alert_handlers/*', is_executable, []), ('enterprise/alert_handlers/*', is_executable, []), ]

5 years, 6 months

6932 FIX cmk-update-agent: Apply urllib3 bugfix

by Andreas Umbreit

Module: check_mk Branch: master Commit: 51843cc9558ae2eeb9f886830784c40670c18af5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51843cc9558ae2… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Dec 5 12:53:20 2018 +0100 6932 FIX cmk-update-agent: Apply urllib3 bugfix It has been observed recently that the agent updater might crash with an error message like <pre>IDNAError: The label ... is not a valid A-label</pre> The cause for this behavior is a bug in the underlying urllib3 python module. However, this has been fixed in a newer urrllib-version and hence we updated the underlying python modules to newer versions in order to apply the bugfix to cmk-update-agent. FEED-3195 Change-Id: Ic95c1b0f918068d0238f79b4541fe18d486c2eb8 --- .werks/6932 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.werks/6932 b/.werks/6932 new file mode 100644 index 0000000..99cb42d --- /dev/null +++ b/.werks/6932 @@ -0,0 +1,18 @@ +Title: cmk-update-agent: Apply urllib3 bugfix +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1544009907 +Class: fix + +It has been observed recently that the agent updater might crash +with an error message like +<pre>IDNAError: The label ... is not a valid A-label</pre> + +The cause for this behavior is a bug in the underlying urllib3 +python module. However, this has been fixed in a newer urrllib-version +and hence we updated the underlying python modules to newer versions +in order to apply the bugfix to cmk-update-agent. +

5 years, 6 months

add regression tests for alcatel checks

by Florian Kromer

Module: check_mk Branch: master Commit: 6a86babb79ddd16d5654a3b676f823ea49378eed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a86babb79ddd1… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Dec 4 18:15:43 2018 +0100 add regression tests for alcatel checks CMK-1188 Change-Id: I765924021449a656851ad8b3546d739cd30e01b8 --- tests/unit/checks/test_alcatel_cpu.py | 36 +++++++++++++++++++++++ tests/unit/checks/test_alcatel_fans.py | 33 +++++++++++++++++++++ tests/unit/checks/test_alcatel_power.py | 52 +++++++++++++++++++++++++++++++++ tests/unit/checks/test_alcatel_temp.py | 39 +++++++++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/tests/unit/checks/test_alcatel_cpu.py b/tests/unit/checks/test_alcatel_cpu.py new file mode 100644 index 0000000..422d295 --- /dev/null +++ b/tests/unit/checks/test_alcatel_cpu.py @@ -0,0 +1,36 @@ +import pytest + +pytestmark = pytest.mark.checks + +CHECK_NAME = "alcatel_cpu" + + +(a)pytest.mark.parametrize("info, result_expected", [ + ([[u'doesnt matter', u'doesent matter'], [u'doesnt matter']], [(None, + "alcatel_cpu_default_levels")]), +]) +def test_inventory_function(check_manager, info, result_expected): + check = check_manager.get_check(CHECK_NAME) + result = check.run_discovery(info) + result = [r for r in result] + assert result == result_expected + + +(a)pytest.mark.parametrize("parameters, info, state_expected, infotext_expected, perfdata_expected", [ + ((30, 40), [[u'29']], 0, 'total: 29.0%', [('util', 29, 30, 40, 0, 100)]), + ((30, 40), [[u'31']], 1, 'total: 31.0% (warn/crit at 30.0%/40.0%)', [('util', 31, 30, 40, 0, + 100)]), + ((30, 40), [[u'41']], 2, 'total: 41.0% (warn/crit at 30.0%/40.0%)', [('util', 41, 30, 40, 0, + 100)]), +]) +def test_check_function(check_manager, parameters, info, state_expected, infotext_expected, + perfdata_expected): + """ + Verifies if check function asserts warn and crit CPU levels. + """ + check = check_manager.get_check(CHECK_NAME) + item = None + state, infotext, perfdata = check.run_check(item, parameters, info) + assert state == state_expected + assert infotext == infotext_expected + assert perfdata == perfdata_expected diff --git a/tests/unit/checks/test_alcatel_fans.py b/tests/unit/checks/test_alcatel_fans.py new file mode 100644 index 0000000..7d29d6d --- /dev/null +++ b/tests/unit/checks/test_alcatel_fans.py @@ -0,0 +1,33 @@ +import pytest + +pytestmark = pytest.mark.checks + +CHECK_NAME = "alcatel_fans" + + +(a)pytest.mark.parametrize("info, result_expected", [ + ([[u'doesnt matter']], [(1, None)]), + ([[u'doesnt matter', u'doesent matter'], [u'doesnt matter']], [(1, None), (2, None)]), +]) +def test_inventory_function(check_manager, info, result_expected): + check = check_manager.get_check(CHECK_NAME) + result = check.run_discovery(info) + result = [r for r in result] + assert result == result_expected + + +(a)pytest.mark.parametrize( + "parameters, item, info, state_expected, infotext_expected, perfdata_expected", [ + ((0, 0), 1, [[u'0']], 2, 'Fan has no status', None), + ((0, 0), 1, [[u'1']], 2, 'Fan not running', None), + ((0, 0), 1, [[u'2']], 0, 'Fan running', None), + ]) +def test_check_function(check_manager, parameters, item, info, state_expected, infotext_expected, + perfdata_expected): + """ + Verifies if check function asserts warn and crit Board and CPU temperature levels. + """ + check = check_manager.get_check(CHECK_NAME) + state, infotext = check.run_check(item, parameters, info) + assert state == state_expected + assert infotext_expected in infotext diff --git a/tests/unit/checks/test_alcatel_power.py b/tests/unit/checks/test_alcatel_power.py new file mode 100644 index 0000000..d85f1d8 --- /dev/null +++ b/tests/unit/checks/test_alcatel_power.py @@ -0,0 +1,52 @@ +import pytest + +pytestmark = pytest.mark.checks + +CHECK_NAME = "alcatel_power" + + +# info: oid end, status, device type, power type +(a)pytest.mark.parametrize( + "info, result_expected", + [ + ([[u'1', u'0', u'0x35000001', u'0']], [('1', None) + ]), # item is oid in case of proper device type + ([[u'1', u'0', u'0x45000002', u'0']], [('1', None) + ]), # item is oid in case of proper device type + ([[u'1', u'0', u'0x45000004', u'0']], [('1', None) + ]), # item is oid in case of proper device type + ([[u'1', u'0', u'0x45000008', u'0']], [('1', None) + ]), # item is oid in case of proper device type + ([[u'1', u'0', u'0x45000009', u'0']], [('1', None) + ]), # item is oid in case of proper device type + ([[u'1', u'0', u'0', u'0']], + []), # no item is oid in case of inproper device type and inproper power type + ([[u'1', u'0', u'0', u'1']], [('1', None)]), # item is oid in case of proper power type + ]) +def test_inventory_function(check_manager, info, result_expected): + check = check_manager.get_check(CHECK_NAME) + result = check.run_discovery(info) + result = [r for r in result] + assert result == result_expected + + +# info: oid end, status, device type, power type +(a)pytest.mark.parametrize( + "parameters, item, info, state_expected, infotext_expected", + [ + ((0, 0), u'1', [[u'1', u'1', u'0x35000001', u'1']], 0, + 'Supply status OK'), # status == 1, proper ac power type + ((0, 0), u'1', [[u'1', u'1', u'0x35000001', u'2']], 0, + 'Supply status OK'), # status == 1, proper dc power type + ((0, 0), u'1', [[u'1', u'1', u'0x35000001', u'0']], 3, + 'No Power supply connected to this port'), # status == 1, power type no power supply + ((0, 0), u'1', [[u'1', u'2', u'0x35000001', u'1']], 2, + 'Supply in error condition'), # state != 1 + ((0, 0), u'2', [[u'1', u'1', u'0x35000001', u'1']], 3, + 'Supply not found'), # mismatch of item and oid end + ]) +def test_check_function(check_manager, parameters, item, info, state_expected, infotext_expected): + check = check_manager.get_check(CHECK_NAME) + state, infotext = check.run_check(item, parameters, info) + assert state == state_expected + assert infotext_expected in infotext diff --git a/tests/unit/checks/test_alcatel_temp.py b/tests/unit/checks/test_alcatel_temp.py new file mode 100644 index 0000000..9a66a99 --- /dev/null +++ b/tests/unit/checks/test_alcatel_temp.py @@ -0,0 +1,39 @@ +import pytest + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("info, item_expected, data_expected", [ + ([[u'29', u'0']], 'Board', {}), + ([[u'0', u'29']], 'CPU', {}), +]) +def test_inventory_function(check_manager, info, item_expected, data_expected): + """ + Verifies if the item is detected corresponding to info content. + """ + check = check_manager.get_check("alcatel_temp") + result = check.run_discovery(info) + result = [r for r in result] + assert result[0][0] == item_expected + assert result[0][1] == data_expected + + +(a)pytest.mark.parametrize( + "parameters, item, info, state_expected, infotext_expected, perfdata_expected", [ + ((30, 40), u'Slot 1 Board', [[u'29', u'0']], 0, '29', [('temp', 29, 30, 40)]), + ((30, 40), u'Slot 1 Board', [[u'31', u'0']], 1, '31', [('temp', 31, 30, 40)]), + ((30, 40), u'Slot 1 Board', [[u'41', u'0']], 2, '41', [('temp', 41, 30, 40)]), + ((30, 40), u'Slot 1 CPU', [[u'0', u'29']], 0, '29', [('temp', 29, 30, 40)]), + ((30, 40), u'Slot 1 CPU', [[u'0', u'31']], 1, '31', [('temp', 31, 30, 40)]), + ((30, 40), u'Slot 1 CPU', [[u'0', u'41']], 2, '41', [('temp', 41, 30, 40)]), + ]) +def test_check_function(check_manager, parameters, item, info, state_expected, infotext_expected, + perfdata_expected): + """ + Verifies if check function asserts warn and crit Board and CPU temperature levels. + """ + check = check_manager.get_check("alcatel_temp") + state, infotext, perfdata = check.run_check(item, parameters, info) + assert state == state_expected + assert infotext_expected in infotext + assert perfdata == perfdata_expected

5 years, 6 months

6922 FIX agent_siemens_plc: Fixed configuration of individual values to fetch for single devices

by Lars Michelsen

Module: check_mk Branch: master Commit: b94d07fe01a09eb04d6cf9ac75559815aab08130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b94d07fe01a09e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 12:13:03 2018 +0100 6922 FIX agent_siemens_plc: Fixed configuration of individual values to fetch for single devices The configured values were not saved by the GUI after creating / editing a rule in the rule set "Siemens PLC (SPS)". Change-Id: Ie84c2ca5213106f84eb6920ffb962478079e30e6 --- .werks/6922 | 12 ++++++++++++ cmk/gui/plugins/wato/datasource_programs.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6922 b/.werks/6922 new file mode 100644 index 0000000..1598151 --- /dev/null +++ b/.werks/6922 @@ -0,0 +1,12 @@ +Title: agent_siemens_plc: Fixed configuration of individual values to fetch for single devices +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544005182 + +The configured values were not saved by the GUI after creating / editing a rule in the rule set +"Siemens PLC (SPS)". diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 14667dc..163db01 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -905,7 +905,7 @@ register_rule( ), title=_("Values to fetch from this device"), validate=validate_siemens_plc_values, - magic='@?@', + magic='@;@', )), ], optional_keys=["timeout"],

5 years, 6 months

Simplified local integration test execution a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 648a44dd72efc59d5b7d7064568cdd837b45fc5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=648a44dd72efc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 08:13:18 2018 +0100 Simplified local integration test execution a bit Integration tests are now executed in dedicated sites, not heute / stable anymore. These sites are named "int_[branch_part]". While the branch part is calculated out of the current git branch name. The branch names are mangled like this: 1. split by "/" and only the last element is used, then all characters except the ones allowed in site IDs are strippted. This should make local integration test execution a bit more straight forward because there is no relation to the development sites anymore. Change-Id: Idd9320f5e43eca53b79180251ee9e36e98ff4269 --- tests/packaging/test_files.py | 59 +++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 2217b20..b1372d1 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -3,6 +3,7 @@ import subprocess import re import pytest + @pytest.mark.parametrize("what", [ ("rpm"), ("deb"), @@ -10,7 +11,7 @@ import pytest ]) def test_package_built(version_path, what): files = os.listdir(version_path) - count = len([ e for e in files if e.startswith("check-mk-") and e.endswith("."+what) ]) + count = len([e for e in files if e.startswith("check-mk-") and e.endswith("." + what)]) assert count > 0, "Found no %s package in %s" % (what.upper(), version_path) @@ -22,10 +23,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 250*1024*1024), - ("deb", 94*1024*1024, 210*1024*1024), - ("cma", 169*1024*1024, 255*1024*1024), - ("tar.gz", 320*1024*1024, 415*1024*1024), + ("rpm", 152 * 1024 * 1024, 235 * 1024 * 1024), + ("deb", 126 * 1024 * 1024, 196 * 1024 * 1024), + ("cma", 214 * 1024 * 1024, 241 * 1024 * 1024), + ("tar.gz", 370 * 1024 * 1024, 439 * 1024 * 1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what): @@ -42,31 +43,33 @@ def test_package_sizes(version_path, what, min_size, max_size): def test_files_not_in_version_path(version_path, what): allowed_patterns = { "rpm": [ - "/opt", - "/opt/omd", - "/opt/omd/apache", - "/opt/omd/sites", + "/opt$", + "/opt/omd$", + "/opt/omd/apache$", + "/opt/omd/sites$", "/opt/omd/versions", ], "deb": [ - "/", - "/opt/", - "/opt/omd/", - "/usr/", - "/usr/share/", - "/usr/share/man/", - "/usr/share/man/man8/", - "/usr/share/doc/", - "/usr/share/doc/check-mk-(raw|enterprise)-*/", - "/usr/share/doc/check-mk-(raw|enterprise)-*/changelog.gz", - "/usr/share/doc/check-mk-(raw|enterprise)-*/COPYING.gz", - "/usr/share/doc/check-mk-(raw|enterprise)-*/TEAM", - "/usr/share/doc/check-mk-(raw|enterprise)-*/copyright", - "/usr/share/doc/check-mk-(raw|enterprise)-*/README", - "/usr/share/doc/check-mk-(raw|enterprise)-*/README.Debian", - "/etc/", - "/etc/init.d/", - "/etc/init.d/check-mk-(raw|enterprise)-*", + "/$", + "/opt/$", + "/opt/omd/$", + "/opt/omd/apache/$", + "/opt/omd/sites/$", + "/opt/omd/versions/", # All files below this are allowed + "/usr/$", + "/usr/share/$", + "/usr/share/man/$", + "/usr/share/man/man8/$", + "/usr/share/doc/$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/changelog.gz$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/COPYING.gz$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/TEAM$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/copyright$", + "/usr/share/doc/check-mk-(raw|enterprise|managed)-.*/README$", + "/etc/$", + "/etc/init.d/$", + "/etc/init.d/check-mk-(raw|enterprise|managed)-.*$", ], } @@ -84,7 +87,7 @@ def test_files_not_in_version_path(version_path, what): for path in paths: if not path.startswith("/opt/omd/versions/"): is_allowed = any(re.match(p, path) for p in allowed_patterns[what]) - assert is_allowed, "Found unexpected global file: %s" % path + assert is_allowed, "Found unexpected global file: %s in %s" % (path, pkg) def test_cma_only_contains_version_paths(version_path):

5 years, 6 months

Simplified local integration test execution a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: caa86253da982e883d792709d7cd1be08a03b2c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caa86253da982e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 08:13:18 2018 +0100 Simplified local integration test execution a bit Integration tests are now executed in dedicated sites, not heute / stable anymore. These sites are named "int_[branch_part]". While the branch part is calculated out of the current git branch name. The branch names are mangled like this: 1. split by "/" and only the last element is used, then all characters except the ones allowed in site IDs are strippted. This should make local integration test execution a bit more straight forward because there is no relation to the development sites anymore. Change-Id: Idd9320f5e43eca53b79180251ee9e36e98ff4269 --- tests/conftest.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 9a338c5..c407e50 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,6 +10,7 @@ pytest.register_assert_rewrite( "unit.cmk.gui.tools") import _pytest.monkeypatch +import re import collections import errno import os @@ -250,10 +251,15 @@ def _get_site_object(): def _site_id(): site_id = os.environ.get("OMD_SITE") - if site_id is None: - site_id = file(testlib.repo_path() + "/.site").read().strip() - os.putenv("OMD_SITE", site_id) + if site_id is not None: + return site_id + branch_name = os.environ.get("BRANCH", testlib.current_branch_name()) + # Split by / and get last element, remove unwanted chars + branch_part = re.sub("[^a-zA-Z0-9_]", "", branch_name.split("/")[-1]) + site_id = "int_%s" % branch_part + + os.putenv("OMD_SITE", site_id) return site_id

5 years, 6 months

Fixed possible missing unlock during store.release_all_locks() calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 2580add54fa65cc48b86184b13439a9ea4c95e6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2580add54fa65c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 4 16:54:21 2018 +0100 Fixed possible missing unlock during store.release_all_locks() calls Change-Id: I119e59dbc96e25c30edfc0e719f88a86a4f7b996 --- cmk/store.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/store.py b/cmk/store.py index 3b53c23..29afdef 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -352,7 +352,7 @@ def release_all_locks(): logger.debug("g_aquired_locks: %r", g_aquired_locks) logger.debug("g_locked_paths: %r", g_locked_paths) - for path, _unused_fd in g_aquired_locks: + for path, _unused_fd in g_aquired_locks[:]: release_lock(path) g_aquired_locks = []

5 years, 6 months

YAPFed file

by Lars Michelsen

Module: check_mk Branch: master Commit: f52a8a4d75fd34a9a70a10ffa4c25b5b71807228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f52a8a4d75fd34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 08:09:59 2018 +0100 YAPFed file Change-Id: Iade3510e5788092cbcb4d473a2e73e994134e2b2 --- tests/conftest.py | 60 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7d37c03..9a338c5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,31 +33,35 @@ import testlib EXECUTE_IN_SITE, EXECUTE_IN_VENV = True, False test_types = collections.OrderedDict([ - ("unit", EXECUTE_IN_VENV), - ("pylint", EXECUTE_IN_VENV), - ("docker", EXECUTE_IN_VENV), + ("unit", EXECUTE_IN_VENV), + ("pylint", EXECUTE_IN_VENV), + ("docker", EXECUTE_IN_VENV), ("integration", EXECUTE_IN_SITE), - ("gui_crawl", EXECUTE_IN_SITE), - ("packaging", EXECUTE_IN_VENV), + ("gui_crawl", EXECUTE_IN_SITE), + ("packaging", EXECUTE_IN_VENV), ]) + def pytest_addoption(parser): """Register the -T option to pytest""" - options = [ name for opt in parser._anonymous.options for name in opt.names() ] + options = [name for opt in parser._anonymous.options for name in opt.names()] # conftest.py is symlinked from enterprise/tests/conftest.py which makes it being executed # twice. Only register this option once. if "-T" in options: return - parser.addoption("-T", action="store", metavar="TYPE", default=None, - help="Run tests of the given TYPE. Available types are: %s" % - ", ".join(test_types.keys())) + parser.addoption( + "-T", + action="store", + metavar="TYPE", + default=None, + help="Run tests of the given TYPE. Available types are: %s" % ", ".join(test_types.keys())) + def pytest_configure(config): """Register the type marker to pytest""" - config.addinivalue_line("markers", - "type(TYPE): Mark TYPE of test. Available: %s" % - ", ".join(test_types.keys())) + config.addinivalue_line( + "markers", "type(TYPE): Mark TYPE of test. Available: %s" % ", ".join(test_types.keys())) def pytest_collection_modifyitems(items): @@ -65,7 +69,7 @@ def pytest_collection_modifyitems(items): for item in items: type_marker = item.get_closest_marker("type") if type_marker and type_marker.args: - continue # Do not modify manually set marks + continue # Do not modify manually set marks file_path = "%s" % item.reportinfo()[0] if "tests/unit" in file_path: @@ -105,13 +109,15 @@ def fake_version_and_paths(): import cmk monkeypatch.setattr(cmk, "omd_version", lambda: "%s.cee" % cmk.__version__) - monkeypatch.setattr("cmk.paths.checks_dir", "%s/checks" % cmk_path()) - monkeypatch.setattr("cmk.paths.notifications_dir", "%s/notifications" % cmk_path()) - monkeypatch.setattr("cmk.paths.inventory_dir", "%s/inventory" % cmk_path()) + monkeypatch.setattr("cmk.paths.checks_dir", "%s/checks" % cmk_path()) + monkeypatch.setattr("cmk.paths.notifications_dir", "%s/notifications" % cmk_path()) + monkeypatch.setattr("cmk.paths.inventory_dir", "%s/inventory" % cmk_path()) monkeypatch.setattr("cmk.paths.check_manpages_dir", "%s/checkman" % cmk_path()) - monkeypatch.setattr("cmk.paths.tmp_dir", tmp_dir) - monkeypatch.setattr("cmk.paths.precompiled_checks_dir", os.path.join(tmp_dir, "var/check_mk/precompiled_checks")) - monkeypatch.setattr("cmk.paths.include_cache_dir", os.path.join(tmp_dir, "check_mk/check_includes")) + monkeypatch.setattr("cmk.paths.tmp_dir", tmp_dir) + monkeypatch.setattr("cmk.paths.precompiled_checks_dir", + os.path.join(tmp_dir, "var/check_mk/precompiled_checks")) + monkeypatch.setattr("cmk.paths.include_cache_dir", + os.path.join(tmp_dir, "check_mk/check_includes")) # Cleanup temporary directory created above @@ -167,7 +173,7 @@ def pytest_cmdline_main(config): Depending on the selected "type" marker the environment is ensured or switched here.""" if not config.getoption("-T"): - return # missing option is handled later + return # missing option is handled later context = test_types[config.getoption("-T")] if context == EXECUTE_IN_SITE: @@ -179,15 +185,16 @@ def pytest_cmdline_main(config): def verify_virtualenv(): if not testlib.virtualenv_path(): raise SystemExit("ERROR: Please load virtual environment first " - "(Use \"pipenv shell\" or configure direnv)") + "(Use \"pipenv shell\" or configure direnv)") def is_running_as_site_user(): return pwd.getpwuid(os.getuid()).pw_name == _site_id() + def setup_site_and_switch_user(): if is_running_as_site_user(): - return # This is executed as site user. Nothing to be done. + return # This is executed as site user. Nothing to be done. sys.stdout.write("===============================================\n") sys.stdout.write("Setting up site '%s'\n" % _site_id()) @@ -233,8 +240,12 @@ def _get_site_object(): def reuse_site(): return os.environ.get("REUSE", "1") == "1" - return testlib.Site(site_id=_site_id(), version=site_version(), - edition=site_edition(), reuse=reuse_site(), branch=site_branch()) + return testlib.Site( + site_id=_site_id(), + version=site_version(), + edition=site_edition(), + reuse=reuse_site(), + branch=site_branch()) def _site_id(): @@ -253,6 +264,7 @@ def _site_id(): add_python_paths() fake_version_and_paths() + # Session fixtures must be in conftest.py to work properly @pytest.fixture(scope="session", autouse=True) def site(request):

5 years, 6 months

Fixed flaky unreachable notification integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a6e2b2163eba9e1e1339d1513ce65c85c06a67c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a6e2b2163eba9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 07:33:21 2018 +0100 Fixed flaky unreachable notification integration tests * Each CMC test triggered a history log rotation using the ROTATE_LOGFILE command which is then processed asynchronously by the core. * The tests were not waiting for the log rotation, opened a handle on the old log file and started the test. The asynchronous log rotation could then randomly happen during the test making it fail. * The initial rotation action is now waiting up to 10 seconds for a completed log rotation. In case that fails the test will fail. Otherwise the test will work on a single log file as intended. * Removed debug output from test code Change-Id: I97e1d64a8bb8f12054038dfd700d60f479a0df0c --- .../notifications/test_unreachable_notifications.py | 14 ++++++++++---- tests/testlib/__init__.py | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/tests/integration/notifications/test_unreachable_notifications.py b/tests/integration/notifications/test_unreachable_notifications.py index 200a404..9e57c0d 100644 --- a/tests/integration/notifications/test_unreachable_notifications.py +++ b/tests/integration/notifications/test_unreachable_notifications.py @@ -1,11 +1,10 @@ #!/usr/bin/env python # encoding: utf-8 -import pytest import time import os -import sys -from testlib import web, WatchLog +import pytest +from testlib import web, WatchLog, wait_until # pylint: disable=unused-import STATE_UP = 0 STATE_DOWN = 1 @@ -101,7 +100,14 @@ def initial_state(site, scenario): # Before each test: Clear logs if scenario.core == "cmc": + # The command is processed asynchronously -> Wait for completion + inode_before = os.stat(site.path("var/check_mk/core/history")).st_ino site.live.command("[%d] ROTATE_LOGFILE" % time.time()) + + def rotated_log(): + return inode_before != os.stat(site.path("var/check_mk/core/history")).st_ino + + wait_until(rotated_log, timeout=10) else: site.delete_file("var/nagios/nagios.log") @@ -404,7 +410,7 @@ def test_down_child_becomes_unreachable_and_down_again(scenario, site, initial_s # - Next child check DOWN # cmc: expect no notification (till next parent check confirms UP) - # nagios: expect notification without + # nagios: expect notification without site.send_host_check_result("notify-test-child", STATE_DOWN, "DOWN") log.check_logged("HOST ALERT: notify-test-child;DOWN;HARD;1;") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index b0738c4..9aa8765 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -324,7 +324,7 @@ class Site(object): schedule_ts = time.time() time.sleep(0.1) - print "last_check_before", last_check_before, "schedule_ts", schedule_ts + #print "last_check_before", last_check_before, "schedule_ts", schedule_ts self.live.command( "[%d] PROCESS_HOST_CHECK_RESULT;%s;%d;%s" % (schedule_ts, hostname, state, output)) @@ -340,7 +340,7 @@ class Site(object): schedule_ts = time.time() time.sleep(0.1) - print "last_check_before", last_check_before, "schedule_ts", schedule_ts + #print "last_check_before", last_check_before, "schedule_ts", schedule_ts self.live.command("[%d] SCHEDULE_FORCED_SVC_CHECK;%s;%s;%d" % (schedule_ts, hostname, service_description.encode("utf-8"), schedule_ts)) @@ -1757,38 +1757,39 @@ class WatchLog(object): self._site.write_file(self._log_path(), "") fobj = open(self._site.path(self._log_path()), "r") - sys.stdout.write("%r\n" % os.stat(self._site.path(self._log_path()))) fobj.seek(0, 2) # go to end of file return fobj def check_logged(self, match_for, timeout=None): + if timeout is None: + timeout = self._default_timeout + if not self._check_for_line(match_for, timeout): raise Exception( "Did not find %r in %s after %d seconds" % (match_for, self._log_path(), timeout)) def check_not_logged(self, match_for, timeout=None): + if timeout is None: + timeout = self._default_timeout + if self._check_for_line(match_for, timeout): raise Exception( "Found %r in %s after %d seconds" % (match_for, self._log_path(), timeout)) def _check_for_line(self, match_for, timeout): - if timeout is None: - timeout = self._default_timeout - timeout_at = time.time() + timeout sys.stdout.write( "Start checking for matching line at %d until %d\n" % (time.time(), timeout_at)) - sys.stdout.write("%r\n" % os.stat(self._site.path(self._log_path()))) while time.time() < timeout_at: #print "read till timeout %0.2f sec left" % (timeout_at - time.time()) line = self._log.readline() - sys.stdout.write("PROCESS LINE: %r\n" % line) + if line: + sys.stdout.write("PROCESS LINE: %r\n" % line) if match_for in line: return True time.sleep(0.1) sys.stdout.write("Timed out at %d\n" % (time.time())) - sys.stdout.write("%r\n" % os.stat(self._site.path(self._log_path()))) return False

5 years, 6 months

Add .mypy_cache directory to .gitignore

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 70b0b3ece6239caf7db273f10d418bccbd9be5a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70b0b3ece6239c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 4 16:49:59 2018 +0100 Add .mypy_cache directory to .gitignore Change-Id: If13bed4a0d8a19234368c796bdf29d17c10d5f6b --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 39f389c..c3ec4772 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ .coverage .directory .metadata +.mypy_cache .ropeproject GPATH GRTAGS

5 years, 6 months

← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018