Module: check_mk
Branch: master
Commit: f3ae1146720b18f5c44af89c6605c41264686246
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3ae1146720b18…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Oct 23 13:57:06 2018 +0200
Fixed python warnings during integration tests
Change-Id: Ide15bc4b4bd2f4fe9f56cc0ac26038cbc1961e41
---
tests/integration/cmk_base/test_data_sources.py | 9 ++++-----
tests/integration/cmk_base/test_mgmt_board.py | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/integration/cmk_base/test_data_sources.py
b/tests/integration/cmk_base/test_data_sources.py
index 98c387d..5bda169 100644
--- a/tests/integration/cmk_base/test_data_sources.py
+++ b/tests/integration/cmk_base/test_data_sources.py
@@ -198,7 +198,7 @@ def test_mode_inventory_caching(test_cfg, hosts, cache, force,
monkeypatch):
cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False)
-def test_mode_inventory_as_check(test_cfg, monkeypatch, mock):
+def test_mode_inventory_as_check(test_cfg, monkeypatch):
_patch_data_source_run(monkeypatch)
assert cmk_base.modes.check_mk.mode_inventory_as_check({}, "ds-test-host1")
== 0
assert _counter_run == 2
@@ -211,13 +211,13 @@ def test_mode_discover_marked_hosts(test_cfg, monkeypatch):
#assert _counter_run == 2
-def test_mode_check_discovery_default(test_cfg, monkeypatch, mock):
+def test_mode_check_discovery_default(test_cfg, monkeypatch):
_patch_data_source_run(monkeypatch, _max_cachefile_age=0)
assert cmk_base.modes.check_mk.mode_check_discovery("ds-test-host1") == 1
assert _counter_run == 2
-def test_mode_check_discovery_cached(test_cfg, monkeypatch, mock):
+def test_mode_check_discovery_cached(test_cfg, monkeypatch):
_patch_data_source_run(monkeypatch, _max_cachefile_age=120,
_use_outdated_cache_file=True, _may_use_cache_file=True)
try:
@@ -229,7 +229,7 @@ def test_mode_check_discovery_cached(test_cfg, monkeypatch, mock):
cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False)
-def test_mode_discover_all_hosts(test_cfg, monkeypatch, mock):
+def test_mode_discover_all_hosts(test_cfg, monkeypatch):
_patch_data_source_run(monkeypatch, _may_use_cache_file=True,
_max_cachefile_age=120)
cmk_base.modes.check_mk.mode_discover({"discover": 1}, [])
assert _counter_run == len(config.all_active_realhosts())*2
@@ -461,7 +461,6 @@ def test_data_sources_of_hosts(clear_config_caches, monkeypatch):
]
import cmk_base.data_sources
- import cmk_base.config as config
all_hosts = [ ("%s|%s" % (name, h["tags"])) for name, h in hosts
]
monkeypatch.setattr(config, "all_hosts", all_hosts)
diff --git a/tests/integration/cmk_base/test_mgmt_board.py
b/tests/integration/cmk_base/test_mgmt_board.py
index b037077..78a507f 100644
--- a/tests/integration/cmk_base/test_mgmt_board.py
+++ b/tests/integration/cmk_base/test_mgmt_board.py
@@ -14,7 +14,6 @@ def clear_config_caches(monkeypatch):
monkeypatch.setattr(cmk_base, "runtime_cache",
cmk_base.caching.CacheManager())
-(a)pytest.fixture(scope="function")
def reload_config():
# Needs to be done together, even when the checks are not directly needed
import cmk_base.check_api as check_api
@@ -31,7 +30,8 @@ def enable_debug():
@pytest.fixture(autouse=True)
-def test_cfg(web, clear_config_caches, reload_config, enable_debug):
+def test_cfg(web, clear_config_caches, enable_debug):
+ reload_config()
yield
#