Module: check_mk
Branch: master
Commit: e8e2c2a3c4394c4926f92ab24eabf5c8b8b959c6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e2c2a3c4394c…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Apr 3 09:34:57 2018 +0200
Adapted tests to latest EC changes, part 3.
Change-Id: I81aac3d8930b5e380bcf04b3dff6c6435547ac73
---
tests/integration/cmk/ec/test_mkeventd_status.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py
b/tests/integration/cmk/ec/test_mkeventd_status.py
index 46d1edf..8daee26 100644
--- a/tests/integration/cmk/ec/test_mkeventd_status.py
+++ b/tests/integration/cmk/ec/test_mkeventd_status.py
@@ -38,12 +38,11 @@ class FakeStatusSocket(object):
@pytest.fixture(scope="function")
def settings():
- cmk.ec.main.g_settings = cmk.ec.settings.settings(
+ return cmk.ec.settings.settings(
'1.2.3i45',
pathlib.Path(cmk.paths.omd_root),
pathlib.Path(cmk.paths.default_config_dir),
['mkeventd'])
- return cmk.ec.main.g_settings
@pytest.fixture(scope="function")
@@ -54,14 +53,12 @@ def config(settings):
@pytest.fixture(scope="function")
def perfcounters():
- cmk.ec.main.g_perfcounters = cmk.ec.main.Perfcounters()
- return cmk.ec.main.g_perfcounters
+ return cmk.ec.main.Perfcounters()
@pytest.fixture(scope="function")
def event_status(settings):
- cmk.ec.main.g_event_status = cmk.ec.main.EventStatus(settings, perfcounters)
- return cmk.ec.main.g_event_status
+ return cmk.ec.main.EventStatus(settings, perfcounters)
@pytest.fixture(scope="function")