[checkmk-commits] Run livestatus tests with nagios enabled and with cmc enabled

Module: check_mk Branch: master Commit: 27a760ef38758221dbbbe9202f1e5a5cfaf1ad06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a760ef387582… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 15:46:34 2016 +0200 Run livestatus tests with nagios enabled and with cmc enabled --- tests/livestatus/test_livestatus.py | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/livestatus/test_livestatus.py b/tests/livestatus/test_livestatus.py index 670ad19..bb904a1 100644 --- a/tests/livestatus/test_livestatus.py +++ b/tests/livestatus/test_livestatus.py @@ -6,21 +6,28 @@ from testlib import web @pytest.fixture(scope="module") def default_cfg(web): - try: - web.add_host("livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) + web.add_host("livestatus-test-host", attributes={ + "ipaddress": "127.0.0.1", + }) - web.discover_services("livestatus-test-host") + web.discover_services("livestatus-test-host") - web.activate_changes() - finally: - web.delete_host("livestatus-test-host") + web.activate_changes() + yield None + + # + # Cleanup code + # + + web.delete_host("livestatus-test-host") # Simply detects all tables by querying the columns table and then # queries each of those tables without any columns and filters -def test_tables(default_cfg, site): +(a)pytest.mark.parametrize(("core")ore"), [ "nagios", "cmc" ]) +def test_tables(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + existing_tables = set([]) for row in site.live.query_table_assoc("GET columns\n"): @@ -29,17 +36,26 @@ def test_tables(default_cfg, site): assert len(existing_tables) > 5 for table in existing_tables: + if core == "nagios" and table == "statehist": + continue # the statehist table in nagios can not be fetched without time filter + result = site.live.query("GET %s\n" % table) assert type(result) == list -def test_host_table(default_cfg, site): +(a)pytest.mark.parametrize(("core")ore"), [ "nagios", "cmc" ]) +def test_host_table(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + rows = site.live.query("GET hosts") assert type(rows) == list assert len(rows) >= 2 # header + min 1 host -def test_service_table(default_cfg, site): +(a)pytest.mark.parametrize(("core")ore"), [ "nagios", "cmc" ]) +def test_service_table(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + rows = site.live.query("GET services\nFilter: host_name = livestatus-test-host\n" "Columns: description\n") assert type(rows) == list