Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

Fixed etc directory being created during unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 7adeaeb905ebfb83cb929d49de3fc6576d0fb351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7adeaeb905ebfb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 08:02:18 2019 +0100 Fixed etc directory being created during unit tests * Cleaned up wato_root_dir evalutation from module scope * Mock check_mk_config_dir during unit tests Change-Id: Ib2cc9985f76a80068feb220147faa4015a92d54b --- cmk/gui/watolib/__init__.py | 8 ++++---- cmk/gui/watolib/activate_changes.py | 2 +- cmk/gui/watolib/config_domains.py | 2 +- cmk/gui/watolib/hosts_and_folders.py | 4 ++-- cmk/gui/watolib/notifications.py | 6 +++--- cmk/gui/watolib/password_store.py | 2 +- cmk/gui/watolib/timeperiods.py | 6 +++--- cmk/gui/watolib/utils.py | 6 +++++- tests/conftest.py | 2 ++ 9 files changed, 22 insertions(+), 16 deletions(-) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 347b2ab..61dae95 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -337,10 +337,10 @@ def init_wato_datastructures(with_wato_lock=False): def _need_to_create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ - or os.path.exists(wato_root_dir + "rules.mk") \ - or os.path.exists(wato_root_dir + "groups.mk") \ - or os.path.exists(wato_root_dir + "notifications.mk") \ - or os.path.exists(wato_root_dir + "global.mk"): + or os.path.exists(wato_root_dir() + "rules.mk") \ + or os.path.exists(wato_root_dir() + "groups.mk") \ + or os.path.exists(wato_root_dir() + "notifications.mk") \ + or os.path.exists(wato_root_dir() + "global.mk"): return False return True diff --git a/cmk/gui/watolib/activate_changes.py b/cmk/gui/watolib/activate_changes.py index e00926e..5b5e775 100644 --- a/cmk/gui/watolib/activate_changes.py +++ b/cmk/gui/watolib/activate_changes.py @@ -96,7 +96,7 @@ def add_replication_paths(paths): def get_replication_paths(): paths = [ - ("dir", "check_mk", cmk.gui.watolib.utils.wato_root_dir, ["sitespecific.mk"]), + ("dir", "check_mk", cmk.gui.watolib.utils.wato_root_dir(), ["sitespecific.mk"]), ("dir", "multisite", cmk.gui.watolib.utils.multisite_dir, ["sitespecific.mk"]), ("file", "htpasswd", cmk.utils.paths.htpasswd_file), ("file", "auth.secret", '%s/auth.secret' % os.path.dirname(cmk.utils.paths.htpasswd_file)), diff --git a/cmk/gui/watolib/config_domains.py b/cmk/gui/watolib/config_domains.py index fb4195e..afb6d59 100644 --- a/cmk/gui/watolib/config_domains.py +++ b/cmk/gui/watolib/config_domains.py @@ -60,7 +60,7 @@ class ConfigDomainCore(ConfigDomain): ident = "check_mk" def config_dir(self): - return wato_root_dir + return wato_root_dir() def activate(self): # TODO: Cleanup diff --git a/cmk/gui/watolib/hosts_and_folders.py b/cmk/gui/watolib/hosts_and_folders.py index 0dad5cf..be392f7 100644 --- a/cmk/gui/watolib/hosts_and_folders.py +++ b/cmk/gui/watolib/hosts_and_folders.py @@ -367,7 +367,7 @@ class CREFolder(BaseFolder): @staticmethod def folder_exists(folder_path): - return os.path.exists(wato_root_dir + folder_path) + return os.path.exists(wato_root_dir() + folder_path) @staticmethod def root_folder(): @@ -445,7 +445,7 @@ class CREFolder(BaseFolder): if self._root_dir: self._root_dir = root_dir.rstrip("/") + "/" # FIXME: ugly else: - self._root_dir = wato_root_dir + self._root_dir = wato_root_dir() if folder_path is not None: self._init_by_loading_existing_directory(folder_path) diff --git a/cmk/gui/watolib/notifications.py b/cmk/gui/watolib/notifications.py index b0e840c..6b80bd8 100644 --- a/cmk/gui/watolib/notifications.py +++ b/cmk/gui/watolib/notifications.py @@ -32,7 +32,7 @@ from cmk.gui.watolib.utils import wato_root_dir def load_notification_rules(lock=False): - filename = wato_root_dir + "notifications.mk" + filename = wato_root_dir() + "notifications.mk" notification_rules = store.load_from_mk_file(filename, "notification_rules", [], lock=lock) # Convert to new plugin configuration format @@ -47,9 +47,9 @@ def load_notification_rules(lock=False): def save_notification_rules(rules): - store.mkdir(wato_root_dir) + store.mkdir(wato_root_dir()) store.save_to_mk_file( - wato_root_dir + "notifications.mk", + wato_root_dir() + "notifications.mk", "notification_rules", rules, pprint_value=config.wato_pprint_config) diff --git a/cmk/gui/watolib/password_store.py b/cmk/gui/watolib/password_store.py index 7468320..08017fe 100644 --- a/cmk/gui/watolib/password_store.py +++ b/cmk/gui/watolib/password_store.py @@ -35,7 +35,7 @@ from cmk.gui.watolib.utils import wato_root_dir class PasswordStore(WatoSimpleConfigFile): def __init__(self): super(PasswordStore, self).__init__( - config_file_path=Path(wato_root_dir) / "passwords.mk", + config_file_path=Path(wato_root_dir()) / "passwords.mk", config_variable="stored_passwords") def filter_usable_entries(self, entries): diff --git a/cmk/gui/watolib/timeperiods.py b/cmk/gui/watolib/timeperiods.py index 3b54d49..4d0407a 100644 --- a/cmk/gui/watolib/timeperiods.py +++ b/cmk/gui/watolib/timeperiods.py @@ -48,15 +48,15 @@ def builtin_timeperiods(): def load_timeperiods(): - timeperiods = store.load_from_mk_file(wato_root_dir + "timeperiods.mk", "timeperiods", {}) + timeperiods = store.load_from_mk_file(wato_root_dir() + "timeperiods.mk", "timeperiods", {}) timeperiods.update(builtin_timeperiods()) return timeperiods def save_timeperiods(timeperiods): - store.mkdir(wato_root_dir) + store.mkdir(wato_root_dir()) store.save_to_mk_file( - wato_root_dir + "timeperiods.mk", + wato_root_dir() + "timeperiods.mk", "timeperiods", _filter_builtin_timeperiods(timeperiods), pprint_value=config.wato_pprint_config) diff --git a/cmk/gui/watolib/utils.py b/cmk/gui/watolib/utils.py index 568299c..48566bf 100644 --- a/cmk/gui/watolib/utils.py +++ b/cmk/gui/watolib/utils.py @@ -47,7 +47,11 @@ NEGATE = '@negate' NO_ITEM = {} # Just an arbitrary unique thing ENTRY_NEGATE_CHAR = "!" -wato_root_dir = cmk.utils.paths.check_mk_config_dir + "/wato/" + +def wato_root_dir(): + return cmk.utils.paths.check_mk_config_dir + "/wato/" + + multisite_dir = cmk.utils.paths.default_config_dir + "/multisite.d/wato/" # TODO: Move this to CEE specific code again liveproxyd_config_dir = cmk.utils.paths.default_config_dir + "/liveproxyd.d/wato/" diff --git a/tests/conftest.py b/tests/conftest.py index d8f47e5..5240b1c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -120,6 +120,8 @@ def fake_version_and_paths(): os.path.join(tmp_dir, "var/check_mk/precompiled_checks")) monkeypatch.setattr("cmk.utils.paths.include_cache_dir", os.path.join(tmp_dir, "check_mk/check_includes")) + monkeypatch.setattr("cmk.utils.paths.check_mk_config_dir", + os.path.join(tmp_dir, "etc/check_mk/conf.d")) # Cleanup temporary directory created above

5 years, 6 months

Another hack to get a working set of modules for tests in the site

by Lars Michelsen

Module: check_mk Branch: master Commit: 5192fd5a5892325e5996e75047d6b10b71bad2ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5192fd5a589232… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 15:39:54 2019 +0100 Another hack to get a working set of modules for tests in the site This is just a temporary(tm) fix until we clean up the whole site integration test stuff. Change-Id: I2fa3a1a8181a690835b76e2830ad2b0b1e2393f0 --- tests/testlib/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index bcff23c..2ceefbe 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -730,11 +730,14 @@ class Site(object): bin_dir = venv / "bin" packages_dir = venv / "lib/python2.7/site-packages" + enforce_override = ["backports"] + for file_name in os.listdir(str(packages_dir)): # Only copy modules that do not exist in regular module path - if os.path.exists("%s/lib/python/%s" % (self.root, file_name)) \ - or os.path.exists("%s/lib/python2.7/site-packages/%s" % (self.root, file_name)): - continue + if file_name not in enforce_override: + if os.path.exists("%s/lib/python/%s" % (self.root, file_name)) \ + or os.path.exists("%s/lib/python2.7/site-packages/%s" % (self.root, file_name)): + continue assert os.system("sudo rsync -a --chown %s:%s %s %s/local/lib/python/" % # nosec (self.id, self.id, packages_dir / file_name, self.root)) >> 8 == 0

5 years, 6 months

snmpsimd: Use site python for startup

by Lars Michelsen

Module: check_mk Branch: master Commit: ee9628f1c0e764347e517254a5fa2935abd753cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee9628f1c0e764… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 15:31:07 2019 +0100 snmpsimd: Use site python for startup Change-Id: I38a8922c92896e84f0ea806bda75cb37ca6b4414 --- tests/integration/cmk_base/snmp/test_snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 2b75f12..61bfd0a 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -46,7 +46,7 @@ def snmpsim(site, request, tmp_path_factory): log.set_verbosity(2) debug.enable() cmd = [ - "%s/.venv/bin/python" % cmk_path(), + "%s/bin/python" % site.root, snmpsimd_path, #"--log-level=error", "--cache-dir",

5 years, 6 months

7196 FIX agent_prism: Fixed wrong usage and capacity detection

by Ronny Bruska

Module: check_mk Branch: master Commit: 26d28c7b40bfcbb3adc1a95ad53c9baf0d23424c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d28c7b40bfcb… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Mar 7 11:30:55 2019 +0100 7196 FIX agent_prism: Fixed wrong usage and capacity detection The special agent used the API endpoint "storage.usage_bytes" and "storage.capacity_bytes" what leaded to wrong values. New used API endpoints are "storage.user_usage_bytes" and "storage.user_capacity_bytes". Change-Id: I64d002a2a721c85b5c491b33e5ee644c3aace14d --- .werks/7196 | 12 ++++++++++++ agents/special/agent_prism | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/7196 b/.werks/7196 new file mode 100644 index 0000000..4e768ab --- /dev/null +++ b/.werks/7196 @@ -0,0 +1,12 @@ +Title: agent_prism: Fixed wrong usage and capacity detection +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551954114 +Class: fix + +The special agent used the API endpoint "storage.usage_bytes" and "storage.capacity_bytes" +what leaded to wrong values. New used API endpoints are "storage.user_usage_bytes" and +"storage.user_capacity_bytes". diff --git a/agents/special/agent_prism b/agents/special/agent_prism index de3e18f..65ac76c 100755 --- a/agents/special/agent_prism +++ b/agents/special/agent_prism @@ -143,8 +143,8 @@ def output_containers(opener, headers): for entity in obj['entities']: writer.writerow([ - entity['name'], entity['usageStats']['storage.usage_bytes'], - entity['usageStats']['storage.capacity_bytes'] + entity['name'], entity['usageStats']['storage.user_usage_bytes'], + entity['usageStats']['storage.user_capacity_bytes'] ])

5 years, 6 months

7235 WATO now stores host/folder creation meta information

by Lars Michelsen

Module: check_mk Branch: master Commit: ed91385fb52c41836c2732e5aea28acc246c5e01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed91385fb52c41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 10 12:00:04 2019 +0100 7235 WATO now stores host/folder creation meta information When either a host or folder is being created in WATO it now stores the creation time and creator ina meta data attribute. This attribute is shown at the bottom of the the host or folder edit dialog. Hosts or folders created before 1.6 don't have such information stored and will show something like "Created sometime before 1.6". Change-Id: I9c26dc71dfdc50da5f98a67297494e38d299272a --- .werks/7235 | 15 +++++ cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/builtin_attributes.py | 77 +++++++++++++++++++++- cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/wato/__init__.py | 7 +- cmk/gui/watolib/host_attributes.py | 25 ++++++- cmk/gui/watolib/hosts_and_folders.py | 21 ++++++ tests/unit/cmk/gui/watolib/test_host_attributes.py | 27 ++++++-- 8 files changed, 164 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed91385fb5…

5 years, 6 months

Remove ancient cmk --donate command

by Lars Michelsen

Module: check_mk Branch: master Commit: 472aabc3638c569b1acb3da9b2646115ea025f4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=472aabc3638c56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 12:06:37 2019 +0100 Remove ancient cmk --donate command This function was used by the demo site. This mechanism was not used by many users and is not working with the current demo site. CMK-661 Change-Id: I1ccc9d8ebb2b63e22e960733b1ef7431d04ca9f6 --- cmk_base/default_config/base.py | 4 --- cmk_base/donate.py | 61 -------------------------------- cmk_base/modes/check_mk.py | 35 ------------------ tests/integration/cmk_base/test_modes.py | 19 ---------- 4 files changed, 119 deletions(-) diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index e3d925c..869af24 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -28,8 +28,6 @@ # variables that can be overridden in main.mk. Some configuration # variables are preset in checks/* as well. -import cmk as _cmk - # TODO: Remove the duplication with cmk_base.config _ALL_HOSTS = ['@all'] # physical and cluster hosts _NEGATE = '@negate' # negation in boolean lists @@ -187,8 +185,6 @@ extra_host_conf = {} extra_service_conf = {} extra_nagios_conf = "" service_descriptions = {} -donation_hosts = [] -donation_command = 'mail -r checkmk(a)yoursite.de -s "Host donation %s" donatehosts(a)mathias-kettner.de' % _cmk.__version__ scanparent_hosts = [(_ALL_HOSTS)] host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command diff --git a/cmk_base/donate.py b/cmk_base/donate.py deleted file mode 100644 index 123a690..0000000 --- a/cmk_base/donate.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# tails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -import base64 -import os -import sys - -import cmk.utils.paths - -import cmk_base.config as config -import cmk_base.console as console - - -def do_donation(): - donate = [] - cache_files = os.listdir(cmk.utils.paths.tcp_cache_dir) - for host in config.all_active_realhosts(): - if config.in_binary_hostlist(host, config.donation_hosts): - for f in cache_files: - if f == host or f.startswith("%s." % host): - donate.append(f) - - if not donate: - console.error("No hosts specified. You need to set donation_hosts in main.mk.\n") - sys.exit(1) - - console.verbose("Donating files %s\n" % " ".join(cache_files)) - indata = base64.b64encode( - os.popen( # nosec - "tar czf - -C %s %s" % (cmk.utils.paths.tcp_cache_dir, " ".join(donate))).read()) - - output = os.popen(config.donation_command, "w") # nosec - output.write("\n\n@STARTDATA\n") - while len(indata) > 0: - line = indata[:64] - output.write(line) - output.write('\n') - indata = indata[64:] diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 84b55dd..a9a7931 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -51,7 +51,6 @@ import cmk_base.data_sources.abstract import cmk_base.core_nagios import cmk_base.parent_scan import cmk_base.dump_host -import cmk_base.donate import cmk_base.backup import cmk_base.packaging import cmk_base.localize @@ -562,40 +561,6 @@ modes.register( )) #. -# .--donate--------------------------------------------------------------. -# | _ _ | -# | __| | ___ _ __ __ _| |_ ___ | -# | / _` |/ _ \| '_ \ / _` | __/ _ \ | -# | | (_| | (_) | | | | (_| | || __/ | -# | \__,_|\___/|_| |_|\__,_|\__\___| | -# | | -# '----------------------------------------------------------------------' - - -def mode_donate(): - cmk_base.donate.do_donation() - - -modes.register( - Mode( - long_option="donate", - handler_function=mode_donate, - short_help="Email data of configured hosts to MK", - long_help=[ - "This is for those who decided to help the Check_MK project " - "by donating live host data. It tars the cached agent data of " - "those host which are configured in main.mk:donation_hosts and sends " - "them via email to donatehosts(a)mathias-kettner.de. The host data " - "is then publicly available for others and can be used for setting " - "up demo sites, implementing checks and so on.", - "Do this only with test data from test hosts - not with productive " - "data! By donating real-live host data you help others trying out " - "Check_MK and developing checks by donating hosts. This is completely " - "voluntary and turned off by default." - ], - )) - -#. # .--backup/restore------------------------------------------------------. # | _ _ __ _ | # | | |__ __ _ ___| | ___ _ _ __ / / __ ___ ___| |_ | diff --git a/tests/integration/cmk_base/test_modes.py b/tests/integration/cmk_base/test_modes.py index f81b0ee..19639f0 100644 --- a/tests/integration/cmk_base/test_modes.py +++ b/tests/integration/cmk_base/test_modes.py @@ -277,25 +277,6 @@ def test_paths(test_cfg, site): #. -# .--donate--------------------------------------------------------------. -# | _ _ | -# | __| | ___ _ __ __ _| |_ ___ | -# | / _` |/ _ \| '_ \ / _` | __/ _ \ | -# | | (_| | (_) | | | | (_| | || __/ | -# | \__,_|\___/|_| |_|\__,_|\__\___| | -# | | -# '----------------------------------------------------------------------' - - -def test_donate_no_hosts(test_cfg, site): - p = site.execute(["cmk", "--donate"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - assert p.wait() == 1 - assert stderr.startswith("No hosts specified.") - assert stdout == "" - - -#. # .--backup/restore------------------------------------------------------. # | _ _ __ _ | # | | |__ __ _ ___| | ___ _ _ __ / / __ ___ ___| |_ |

5 years, 6 months

Only copy new modules to site for running integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 08bda9c7b637a31e051d790c7c81a2dec329bd4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08bda9c7b637a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 14:51:28 2019 +0100 Only copy new modules to site for running integration tests Change-Id: I5b50125754bf2f6f80a19d1d2437825cfee1a49c --- tests/testlib/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c9a2c2c..bcff23c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -731,12 +731,11 @@ class Site(object): packages_dir = venv / "lib/python2.7/site-packages" for file_name in os.listdir(str(packages_dir)): - if file_name == "kubernetes": + # Only copy modules that do not exist in regular module path + if os.path.exists("%s/lib/python/%s" % (self.root, file_name)) \ + or os.path.exists("%s/lib/python2.7/site-packages/%s" % (self.root, file_name)): continue - #if "cffi" in file_name: - # continue - assert os.system("sudo rsync -a --chown %s:%s %s %s/local/lib/python/" % # nosec (self.id, self.id, packages_dir / file_name, self.root)) >> 8 == 0

5 years, 6 months

Backup restore tests: Recover from stopped sites on failures

by Lars Michelsen

Module: check_mk Branch: master Commit: c41c5869ee0934c86e7299af37b2038d333783de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c41c5869ee0934… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 13:05:22 2019 +0100 Backup restore tests: Recover from stopped sites on failures Change-Id: Iaf1d1cd434f994d097403c2cc059d7d3ed087b39 --- tests/integration/bin/test_mkbackup.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index 1cfcbc7..bbd89c9 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -133,9 +133,16 @@ def _execute_restore(site, backup_id, env=None): stderr=subprocess.PIPE, env=env) stdout, stderr = p.communicate() - assert "Restore completed" in stdout, "Invalid output: %r" % stdout - assert stderr == "" - assert p.wait() == 0 + + try: + assert "Restore completed" in stdout, "Invalid output: %r" % stdout + assert stderr == "" + assert p.wait() == 0 + except Exception: + # Bring back the site in case the restore test fails which may leave the + # site in a stopped state + site.start() + raise #.

5 years, 6 months

Re-enable kubernetes V1ClusterRole patch test

by Lars Michelsen

Module: check_mk Branch: master Commit: e748d5d931b539b5ea0b3b051524bf46f563fdc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e748d5d931b539… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 12:00:54 2019 +0100 Re-enable kubernetes V1ClusterRole patch test Change-Id: Idfc2e0277f94cd95cf05f1bed716b5e7cb1115e3 --- .../cmk/special_agents/test_agent_kubernetes.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/integration/cmk/special_agents/test_agent_kubernetes.py b/tests/integration/cmk/special_agents/test_agent_kubernetes.py index 1f3dad3..e312bab 100644 --- a/tests/integration/cmk/special_agents/test_agent_kubernetes.py +++ b/tests/integration/cmk/special_agents/test_agent_kubernetes.py @@ -1,15 +1,14 @@ -import pytest +import pytest # type: ignore from kubernetes.client.models import V1ClusterRole def test_v1_clusterrole_without_rules(): - # try: - # role = V1ClusterRole(rules=None) - # except ValueError: - # pytest.fail( - # "It must be possible to instantiate a V1ClusterRole without explicit roles. " - # "This is assured by patch 0020-kubernetes-allow-empty-rules-in-clusterrole.dif.") - - # assert role.rules == [] - pass + try: + role = V1ClusterRole(rules=None) + except ValueError: + pytest.fail( + "It must be possible to instantiate a V1ClusterRole without explicit roles. " + "This is assured by patch 0020-kubernetes-allow-empty-rules-in-clusterrole.dif.") + + assert role.rules == []

5 years, 6 months

Quick hack to keep using patched kubernetes module in site

by Lars Michelsen

Module: check_mk Branch: master Commit: d2c548fe007a6fa38f4900330f1a6580207035dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2c548fe007a6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 11:59:27 2019 +0100 Quick hack to keep using patched kubernetes module in site Change-Id: Ic9a9404a18f99bafb7773e3f51f85bdb5e0d1a62 --- tests/testlib/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 5bf9c29..c9a2c2c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -731,6 +731,9 @@ class Site(object): packages_dir = venv / "lib/python2.7/site-packages" for file_name in os.listdir(str(packages_dir)): + if file_name == "kubernetes": + continue + #if "cffi" in file_name: # continue

5 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019