[checkmk-commits] Cleaned up test host creation

Module: check_mk Branch: master Commit: 92e336b251970e6baca1b56c515e17afb9de95d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92e336b251970e… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Feb 26 17:00:09 2019 +0100 Cleaned up test host creation Change-Id: Iaabc40dbf255d89ca4e9c887657292f2dd160c99 --- .../cmk_base/test_services_prediction.py | 24 +-------------------- tests/integration/livestatus/test_livestatus.py | 25 ++++------------------ tests/testlib/__init__.py | 23 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 44 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index 1d6b9e4..f8e4baa 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -11,29 +11,7 @@ from cmk.utils.exceptions import MKGeneralException from cmk_base import prediction -from testlib import web, repo_path # pylint: disable=unused-import - - -def create_linux_test_host(request, web, site, hostname): - def finalizer(): - web.delete_host(hostname) - web.activate_changes() - site.delete_file("var/check_mk/agent_output/%s" % hostname) - site.delete_file("etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname) - - request.addfinalizer(finalizer) - - web.add_host(hostname, attributes={"ipaddress": "127.0.0.1"}) - - site.write_file( - "etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname, - "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['%s']))\n" % - hostname) - - site.makedirs("var/check_mk/agent_output/") - site.write_file( - "var/check_mk/agent_output/%s" % hostname, - file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) +from testlib import web, repo_path, create_linux_test_host # pylint: disable=unused-import @pytest.fixture(scope="module") diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index 187532e..78c8993 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -4,33 +4,16 @@ import pytest import itertools -from testlib import web +from testlib import web, create_linux_test_host @pytest.fixture(scope="module") -def default_cfg(web): +def default_cfg(request, site, web): print "Applying default config" - web.add_host( - "livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) - web.add_host( - "livestatus-test-host.domain", attributes={ - "ipaddress": "127.0.0.1", - }) - + create_linux_test_host(request, web, site, "livestatus-test-host") + create_linux_test_host(request, web, site, "livestatus-test-host.domain") web.discover_services("livestatus-test-host") - web.activate_changes() - yield None - - # - # Cleanup code - # - print "Cleaning up default config" - - web.delete_host("livestatus-test-host") - web.delete_host("livestatus-test-host.domain") # Simply detects all tables by querying the columns table and then diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 755ffdf..ca39b11 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 +# pylint: disable=redefined-outer-name import os import glob @@ -1900,6 +1901,28 @@ def ec(site, web): return ec +def create_linux_test_host(request, web, site, hostname): + def finalizer(): + web.delete_host(hostname) + web.activate_changes() + site.delete_file("var/check_mk/agent_output/%s" % hostname) + site.delete_file("etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname) + + request.addfinalizer(finalizer) + + web.add_host(hostname, attributes={"ipaddress": "127.0.0.1"}) + + site.write_file( + "etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname, + "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['%s']))\n" % + hostname) + + site.makedirs("var/check_mk/agent_output/") + site.write_file( + "var/check_mk/agent_output/%s" % hostname, + file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) + + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ |