[checkmk-commits] Adapted verbose console output and test_inventory_verbose

Module: check_mk Branch: master Commit: d7eebb7eb8a4c27fd65175c292a09fd18b89067c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7eebb7eb8a4c2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 30 07:24:15 2018 +0100 Adapted verbose console output and test_inventory_verbose Change-Id: I12992d042f15e84d1e453d9b48c58ba5bd83e7b8 --- cmk_base/inventory.py | 4 ++-- tests/cmk_base/test_modes.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 26263ab..19dd099 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -171,7 +171,7 @@ def do_inv_check(options, hostname): def do_inv_for(hostname, ipaddress): - console.verbose("Doing HW/SW inventory for %s;" % hostname) + console.verbose("Doing HW/SW inventory for %s;\n" % hostname) _initialize_inventory_tree() inventory_tree = g_inv_tree @@ -221,7 +221,7 @@ def _do_inv_for_realhost(hostname, ipaddress, inventory_tree, status_data_tree): multi_host_sections = sources.get_host_sections(hostname, ipaddress) - console.verbose(" Execute inventory plugins;") + console.verbose("Execute inventory plugins;") import cmk_base.inventory_plugins for section_name, plugin in cmk_base.inventory_plugins.inv_info.items(): section_content = multi_host_sections.get_section_content(hostname, ipaddress, diff --git a/tests/cmk_base/test_modes.py b/tests/cmk_base/test_modes.py index c72c745..56578a5 100644 --- a/tests/cmk_base/test_modes.py +++ b/tests/cmk_base/test_modes.py @@ -551,7 +551,7 @@ def test_inventory_verbose(test_cfg, site): stdout, stderr = p.communicate() assert p.wait() == 0 assert stderr == "" - assert stdout.startswith("Doing HW/SW-Inventory for modes-test-host...") + assert stdout.startswith("Doing HW/SW inventory for modes-test-host;") assert "check_mk " in stdout assert "lnx_if " in stdout assert "mem " in stdout