[checkmk-commits] Removed internal and undocumented Check_MK call "--list-man"

Module: check_mk Branch: master Commit: cc23f066ea04b5610b3bd5c898d910737a38f2ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc23f066ea04b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 13:58:22 2016 +0200 Removed internal and undocumented Check_MK call "--list-man" --- modules/check_mk.py | 5 +---- tests/checkman/test_manpages.py | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 795d156..9d54ffe 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4610,7 +4610,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "man", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "sw-missing=", - "inv-fail-status=", "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks", + "inv-fail-status=", "cmc-file=", "browse-man", "update-dns-cache", "cap", "real-time-checks", "log-to-stdout"] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', @@ -4781,9 +4781,6 @@ try: else: man_pages.print_man_page_table() done = True - elif o in [ '--list-man' ]: - pprint.pprint(man_pages.load_man_page_catalog()) - done = True elif o in [ '-m', '--browse-man' ]: man_pages.print_man_page_browser() done = True diff --git a/tests/checkman/test_manpages.py b/tests/checkman/test_manpages.py index 1437f73..4e639c3 100644 --- a/tests/checkman/test_manpages.py +++ b/tests/checkman/test_manpages.py @@ -29,16 +29,6 @@ def _check_manpage(name): assert found_catalog, "Did not find \"catalog:\" header in manpage \"%s\"" % name -def test_manpage_list(site): - p = site.execute(["check_mk", "--list-man"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - result = p.communicate()[0] - - assert p.returncode == 0 - assert result != "" - assert not "ERROR" in result, "Manpage list broken \"check_mk --list-man\": %s\"" % result - assert type(eval(result)) == dict - - def test_missing_manpage(site): missing = []