Module: check_mk
Branch: master
Commit: 2ed6f3b7280ec3ad8ad54695f9984bd37eb22083
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed6f3b7280ec3…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 29 10:31:21 2017 +0100
Check tests: Automatically use fresh config/runtime caches
Change-Id: I7f029f1b64919e6fe2208ac3c260eeac77be87f6
---
tests/checks/conftest.py | 9 +++++++++
tests/checks/test_df_check.py | 4 ----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/checks/conftest.py b/tests/checks/conftest.py
index d5a7c38..a80ce04 100644
--- a/tests/checks/conftest.py
+++ b/tests/checks/conftest.py
@@ -11,3 +11,12 @@ def check_manager():
manager = testlib.CheckManager()
manager.load()
return manager
+
+
+# Automatically refresh caches for each test
+(a)pytest.fixture(autouse=True, scope="function")
+def clear_config_caches(monkeypatch):
+ import cmk_base
+ import cmk_base.caching
+ monkeypatch.setattr(cmk_base, "config_cache",
cmk_base.caching.CacheManager())
+ monkeypatch.setattr(cmk_base, "runtime_cache",
cmk_base.caching.CacheManager())
diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py
index 288e07c..ce4061d 100644
--- a/tests/checks/test_df_check.py
+++ b/tests/checks/test_df_check.py
@@ -239,7 +239,6 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info,
expected_resu
check = check_manager.get_check("df")
monkeypatch.setitem(cmk_base.checks._check_contexts["df"],
"host_extra_conf_merged", lambda _, __: {"include_volume_name":
include_volume_name})
assert check.run_discovery(check.run_parse(info)) == expected_result
- cmk_base.config_cache.clear_all()
# TODO: Make this work by finding a way to get a check's default levels in this
context.
@@ -247,7 +246,6 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info,
expected_resu
(u"/", "default", info_df_lnx, {})
])
def test_df_check_with_parse(check_manager, monkeypatch, item, params, info,
expected_result):
- import cmk_base
check = check_manager.get_check("df")
if params == "default":
@@ -260,5 +258,3 @@ def test_df_check_with_parse(check_manager, monkeypatch, item, params,
info, exp
assert result[1] == expected_result["infotext"]
if "perfdata" in expected_result:
assert result[2] == expected_result["perfdata"]
-
- cmk_base.config_cache.clear_all()