Module: check_mk
Branch: master
Commit: 0a5bdbb5da27f101cc6e2cadb504a58db3bbd72d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a5bdbb5da27f1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 29 10:32:55 2017 +0100
Cleaned up test: Context is now directly available with the check object
Change-Id: I58f3acb4c2cee77f3ca84d87b50bdaaa60b0b3b2
---
tests/checks/test_df_check.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py
index ce4061d..06d5b65 100644
--- a/tests/checks/test_df_check.py
+++ b/tests/checks/test_df_check.py
@@ -228,8 +228,6 @@ info_df_btrfs = \
(info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs
/dev/sda1', {})], True),
])
def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result,
include_volume_name):
- import cmk_base
-
# NOTE: This commented-out code is the result of trying to mock the the ruleset
variable itself instead of the
# host_extra_conf_merged function. It did not work. Maybe we can get it to work
at a later stage.
# import cmk_base.rulesets
@@ -237,7 +235,7 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info,
expected_resu
# [({"include_volume_name": include_volume_name}, [],
cmk_base.rulesets.ALL_HOSTS, {})])
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})
+ monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __:
{"include_volume_name": include_volume_name})
assert check.run_discovery(check.run_parse(info)) == expected_result