Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Integration tests: Do not clean up .venv directory from jenkins jobs

by Lars Michelsen

Module: check_mk Branch: master Commit: ce15ffc074a48456f0491ad6b295275576ef2f53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce15ffc074a484… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 28 20:51:08 2018 +0200 Integration tests: Do not clean up .venv directory from jenkins jobs Change-Id: I42f2eef8ae55921eab9aa7bbdfa8ec0c33f728d2 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 28077e6..832f374 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -556,7 +556,7 @@ class Site(object): # Prevent build problems of livestatus print("Cleanup git files") - assert os.system("sudo git clean -xfd") >> 8 == 0 + assert os.system("sudo git clean -xfd -e .venv") >> 8 == 0 for path in paths: if os.path.exists("%s/.f12" % path):

6 years, 6 months

Added missing dependency pbr for pyghmi

by Lars Michelsen

Module: check_mk Branch: master Commit: c5b8149da88c3b6d0aaf9c81faaa3472e78f8501 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b8149da88c3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 28 19:46:45 2018 +0200 Added missing dependency pbr for pyghmi Change-Id: I90c413bddaabf0ef2a7f4bacb39657b573bcf1b9 --- Pipfile | 1 + omd/packages/python-modules/Makefile | 1 + omd/packages/python-modules/src/pbr-4.0.0.tar.gz | Bin 0 -> 106169 bytes 3 files changed, 2 insertions(+) diff --git a/Pipfile b/Pipfile index 9cf36fd..4084f63 100644 --- a/Pipfile +++ b/Pipfile @@ -54,6 +54,7 @@ pykerberos = "*" requests-kerberos = "*" tinkerforge = "*" paramiko = "*" +pbr = "*" pyghmi = "*" pathlib2 = "*" python-dateutil = "*" diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 96417fe..ed313bb 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -111,6 +111,7 @@ MODULES += tinkerforge-2.1.15.tar.gz # Added for check_sftp MODULES += paramiko-2.1.2.tar.gz # Added for IPMI monitoring of management interface +MODULES += pbr-4.0.0.tar.gz MODULES += pyghmi-1.0.38.tar.gz MODULES += typing-3.6.4.tar.gz diff --git a/omd/packages/python-modules/src/pbr-4.0.0.tar.gz b/omd/packages/python-modules/src/pbr-4.0.0.tar.gz new file mode 100644 index 0000000..fa99f27 Binary files /dev/null and b/omd/packages/python-modules/src/pbr-4.0.0.tar.gz differ

6 years, 6 months

gui_crawl: Fixed wrong classified

by Lars Michelsen

Module: check_mk Branch: master Commit: a60fcbaca98741004bf39102b244742ef62678ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a60fcbaca98741… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 28 18:49:16 2018 +0200 gui_crawl: Fixed wrong classified Change-Id: If5a7dc1be6f0ddf1b25813a1b911900a6563f01a --- tests/integration/web/test_crawl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/web/test_crawl.py b/tests/integration/web/test_crawl.py index abc74eb..c11a0dd 100644 --- a/tests/integration/web/test_crawl.py +++ b/tests/integration/web/test_crawl.py @@ -284,7 +284,7 @@ class SetQueue(Queue.Queue): class TestCrawler(object): - @pytest.mark.gui_crawl + @pytest.mark.type("gui_crawl") def test_crawl(self, site): self.stats = {} self.todo = SetQueue()

6 years, 6 months

Fixed missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ab068168784634b04a7c24c837f8b2163383c28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab06816878463… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 28 16:39:58 2018 +0200 Fixed missing import Change-Id: I1daa9b89036b15417fc2b29b326c0dd81822a711 --- tests/pylint/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pylint/conftest.py b/tests/pylint/conftest.py index 73231cf..dd3fcc0 100644 --- a/tests/pylint/conftest.py +++ b/tests/pylint/conftest.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys import os import tempfile import shutil

6 years, 6 months

Move unit tests to separate directory tree

by Lars Michelsen

Module: check_mk Branch: master Commit: 49fe22d1611a2f4dd84be75d27920edc3460f891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49fe22d1611a2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 17:21:15 2018 +0100 Move unit tests to separate directory tree Change-Id: Id463f1f14a052ac44250808842c223a15b8f5688 --- pytest.ini | 2 +- tests/checkman/test_manpages.py | 50 --------------- tests/git/test_permissions.py | 2 +- tests/{ => integration}/bin/test_mkbackup.py | 0 .../cmk/ec}/test_mkeventd_status.py | 8 +-- tests/integration/cmk/test_omd_version.py | 17 +++++ tests/{lib => integration/cmk}/test_paths.py | 0 tests/integration/cmk/test_site_werks.py | 32 ++++++++++ .../cmk_base/test-files}/linux-agent-output | 0 .../{ => integration}/cmk_base/test_automations.py | 6 +- .../cmk_base/test_check_variables.py} | 44 ------------- .../cmk_base/test_data_sources.py | 2 +- .../{ => integration}/cmk_base/test_mgmt_board.py | 0 tests/{ => integration}/cmk_base/test_modes.py | 8 +-- .../livestatus/test_liveproxyd.py | 0 .../livestatus/test_livestatus.py | 0 .../test_unreachable_notifications.py | 0 tests/{ => integration}/omd/test_basic_commands.py | 0 tests/{ => integration}/omd/test_hooks.py | 0 tests/{ => integration}/omd/test_init_scripts.py | 0 tests/{ => integration}/omd/test_omd.py | 0 tests/{ => integration}/omd/test_python.py | 0 .../{ => integration}/omd/test_setuid_binaries.py | 0 tests/{ => integration}/web/test_backup.py | 0 tests/{ => integration}/web/test_crawl.py | 0 tests/{ => integration}/web/test_login.py | 0 tests/{ => integration}/web/test_webapi.py | 0 tests/lib/test_werks.py | 73 ---------------------- tests/unit/checkman/test_manpages.py | 11 ++++ tests/{ => unit}/checks/checktestlib.py | 0 tests/{ => unit}/checks/conftest.py | 0 tests/{ => unit}/checks/test_df_check.py | 0 tests/{ => unit}/checks/test_if_check.py | 0 tests/{ => unit}/checks/test_kernel_check.py | 0 .../checks/test_mbg_lantime_ng_refclock.py | 0 tests/{ => unit}/checks/test_mkbackup_check.py | 0 .../checks/test_nfsmounts_and_cifsmounts_check.py | 0 tests/{ => unit}/checks/test_ra32e_power_check.py | 0 .../{ => unit}/checks/test_ra32e_sensors_check.py | 0 tests/{ => unit}/checks/test_ra32e_switch_check.py | 0 tests/{ => unit}/checks/test_statgrab_cpu_check.py | 0 tests/{ => unit}/checks/test_uptime_check.py | 0 tests/{ => unit}/checks/test_veritas_vcs_check.py | 0 .../cmk/structured_data/test_structured_data.py | 2 +- .../cmk/structured_data/tree_test_data/tree_inv | 0 .../tree_test_data/tree_new_addresses | 0 .../tree_new_addresses_arrays_memory | 0 .../structured_data/tree_test_data/tree_new_arrays | 0 .../structured_data/tree_test_data/tree_new_heute | 0 .../tree_test_data/tree_new_interfaces | 0 .../tree_new_large_ora_tablespaces_fixed_len | 0 .../tree_new_large_ora_tablespaces_variable_len | 0 .../structured_data/tree_test_data/tree_new_memory | 0 .../tree_test_data/tree_old_addresses | 0 .../tree_old_addresses_arrays_memory | 0 .../structured_data/tree_test_data/tree_old_arrays | 0 .../structured_data/tree_test_data/tree_old_heute | 0 .../tree_test_data/tree_old_interfaces | 0 .../tree_test_data/tree_old_large_ora_tablespaces | 0 .../structured_data/tree_test_data/tree_old_memory | 0 .../cmk/structured_data/tree_test_data/tree_status | 0 tests/{lib => unit/cmk}/test_base.py | 14 ----- tests/{lib => unit/cmk}/test_crash_reporting.py | 0 tests/{lib => unit/cmk}/test_debug.py | 0 tests/{lib => unit/cmk}/test_log.py | 0 tests/{lib => unit/cmk}/test_man_pages.py | 42 ++++++++++--- tests/{ => unit}/cmk/test_schedule.py | 0 tests/{lib => unit/cmk}/test_store.py | 0 tests/unit/cmk/test_werks.py | 56 +++++++++++++++++ tests/{ => unit}/cmk_base/test_caching.py | 0 tests/unit/cmk_base/test_checks.py | 45 +++++++++++++ tests/{ => unit}/cmk_base/test_rulesets.py | 0 tests/unit/conftest.py | 9 +++ tests/{ => unit}/web/auto_build_test.py | 0 tests/{ => unit}/web/auto_refactor.py | 0 tests/{ => unit}/web/class_deprecated_renderer.py | 0 tests/{ => unit}/web/classes.py | 0 tests/{ => unit}/web/conftest.py | 3 + tests/{ => unit}/web/generate_integration.py | 0 tests/{ => unit}/web/html_tests.py | 13 ++-- tests/{ => unit}/web/test_OutputFunnel.py | 0 tests/{ => unit}/web/test_escaping.py | 10 +-- tests/{ => unit}/web/test_generator.py | 0 tests/{ => unit}/web/test_html.py | 0 tests/{ => unit}/web/test_html.sh | 0 tests/{ => unit}/web/test_html_tests.py | 0 tests/{ => unit}/web/test_integration.py | 0 tests/{ => unit}/web/test_key_mgmt.py | 0 tests/{ => unit}/web/test_request_handler.py | 0 tests/{ => unit}/web/test_table.py | 0 tests/{ => unit}/web/tools.py | 2 +- .../web/unittest_files/body_start.unittest | 0 .../{ => unit}/web/unittest_files/button.unittest | 0 .../web/unittest_files/buttonlink.unittest | 0 .../web/unittest_files/checkbox.unittest | 0 .../unittest_files/context_button_test.unittest | 0 .../unittest_files/default_html_headers.unittest | 0 .../web/unittest_files/empty_icon.unittest | 0 .../{ => unit}/web/unittest_files/header.unittest | 0 tests/{ => unit}/web/unittest_files/help.unittest | 0 .../web/unittest_files/hidden_field.unittest | 0 .../web/unittest_files/html_foot.unittest | 0 .../web/unittest_files/html_head.unittest | 0 tests/{ => unit}/web/unittest_files/icon.unittest | 0 .../web/unittest_files/icon_button.unittest | 0 .../web/unittest_files/icon_select.unittest | 0 .../web/unittest_files/javascript.unittest | 0 .../web/unittest_files/javascript_file.unittest | 0 .../web/unittest_files/play_sound.unittest | 0 .../web/unittest_files/popup_trigger.unittest | 0 .../web/unittest_files/radiobuttons.unittest | 0 .../web/unittest_files/render_icon.unittest | 0 .../web/unittest_files/render_icon_button.unittest | 0 .../{ => unit}/web/unittest_files/select.unittest | 0 .../web/unittest_files/stylesheet.unittest | 0 .../{ => unit}/web/unittest_files/test_1.unittest | 0 .../{ => unit}/web/unittest_files/test_2.unittest | 0 .../{ => unit}/web/unittest_files/test_3.unittest | 0 .../web/unittest_files/text_area.unittest | 0 .../web/unittest_files/text_input.unittest | 0 .../web/unittest_files/top_heading.unittest | 0 .../web/unittest_files/top_heading_left.unittest | 0 .../web/unittest_files/top_heading_right.unittest | 0 tests/{ => unit}/web/unittest_generation/README.md | 0 .../web/unittest_generation/checkbox.testgen | 0 .../web/unittest_generation/help.testgen | 0 126 files changed, 236 insertions(+), 215 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=49fe22d161…

6 years, 6 months

Cleaned up test targets in Makefile

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a9101410ab9c0a5618ea71b2c7c4807ba1693ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a9101410ab9c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 26 09:45:54 2018 +0200 Cleaned up test targets in Makefile * Use the new mandatory "-T" argument of py.test to call the tests of a given type. * Add "test-unit" target to execute all unit tests Change-Id: I9081514eef71778788b3133e5ca64313ee3a13b4 --- pytest.ini | 5 +- tests/Makefile | 22 ++++--- tests/conftest.py | 96 ++++++++++++++++++++++++++++--- tests/git/test_find_debug_code_web.py | 3 - tests/git/test_find_debug_print.py | 4 -- tests/git/test_permissions.py | 4 -- tests/packaging/test_files.py | 5 +- tests/pylint/test_pylint_check_plugins.py | 4 -- tests/pylint/test_pylint_misc.py | 4 -- tests/pylint/test_pylint_web.py | 4 -- tests/unit/conftest.py | 2 - 11 files changed, 104 insertions(+), 49 deletions(-) diff --git a/pytest.ini b/pytest.ini index 43f5b97..88b64f4 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,11 +4,8 @@ testpaths = tests # integration tests work which are executed as site user. addopts = -p no:stepwise -p no:cacheprovider -rs -v --maxfail=1 # Register some markers to classify the tests +# TODO: Are they used? Clean them up markers = - pylint: Mark a test as pylint test. - git: Mark a test to be executed in the Git repository context - packaging: This is a test to execute to verify the packaging of the testbuilds. - gui_crawl: All linked pages of the Web interface are visited and searched for errors html_gentest: Generate test cases for htmllib refactoring. checks: Run all existing test cases for checks. filterwarnings = diff --git a/tests/Makefile b/tests/Makefile index e129d49..0f8ab66 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,31 +1,37 @@ SHELL=/bin/bash -e +PYTEST=py.test -s -vv .PHONY: help test-pylint test-integration test-gui-crawl \ test-bandit test-shellcheck setup format test-mypy \ - test-pylint-simple + test-pylint-simple test-unit test-packaging help: @echo "setup - Install dependencies" - @echo "test-integration - Run integration tests" + @echo "test-unit - Run unit tests" @echo "test-pylint - Run pylint based tests" + @echo "test-integration - Run integration tests" @echo "test-gui-crawl - Run GUI crawl test" @echo "test-bandit - Run bandit (security) tests" @echo "test-shellcheck - Run shellcheck tests" +test-unit: + $(PYTEST) -T unit + test-integration: - py.test \ - -m "not pylint and not packaging and not git and not html_gentest and not gui_crawl" \ - -s \ - -vv + $(PYTEST) -T integration test-gui-crawl: - py.test -s -m gui_crawl + $(PYTEST) -T gui_crawl test-pylint: - py.test -m pylint + $(PYTEST) -T pylint + + +test-packageing: + $(PYTEST) -T packaging test-bandit: diff --git a/tests/conftest.py b/tests/conftest.py index fa956d2..299e61b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,6 +9,79 @@ import testlib import tempfile import shutil import errno +from collections import OrderedDict + +# +# Each test is of one of the following types. +# +# The tests are marked using the marker pytest.marker.type("TYPE") +# which is added to the test automatically according to their location. +# +# With each call to py.test one type of tests needs to be selected using +# the "-T TYPE" option. Only these tests will then be executed. Tests of +# the other type will be skipped. +# + +EXECUTE_IN_SITE, EXECUTE_IN_VENV = True, False + +test_types = OrderedDict([ + ("unit", EXECUTE_IN_VENV), + ("pylint", EXECUTE_IN_VENV), + ("integration", EXECUTE_IN_SITE), + ("gui_crawl", EXECUTE_IN_SITE), + ("packaging", EXECUTE_IN_VENV), +]) + +def pytest_addoption(parser): + """Register the -T option to pytest""" + parser.addoption("-T", action="store", metavar="TYPE", default=None, + help="Run tests of the given TYPE. Available types are: %s" % + ", ".join(test_types.keys())) + +def pytest_configure(config): + """Register the type marker to pytest""" + config.addinivalue_line("markers", + "type(TYPE): Mark TYPE of test. Available: %s" % + ", ".join(test_types.keys())) + + +def pytest_collection_modifyitems(items): + """Mark collected test types based on their location""" + for item in items: + type_marker = item.get_marker("type") + if type_marker and type_marker.args: + continue # Do not modify manually set marks + + file_path = "%s" % item.reportinfo()[0] + if "tests/unit" in file_path: + ty = "unit" + elif "tests/git" in file_path: + ty = "unit" + elif "tests/packaging" in file_path: + ty = "packaging" + elif "tests/pylint" in file_path: + ty = "pylint" + elif "tests/integration" in file_path: + ty = "integration" + else: + raise Exception("Test not TYPE marked: %r" % item) + + item.add_marker(pytest.mark.type.with_args(ty)) + + +def pytest_runtest_setup(item): + """Skip tests of unwanted types""" + test_type = item.get_marker("type") + if test_type is None: + raise Exception("Test is not TYPE marked: %s" % item) + + if not item.config.getoption("-T"): + raise SystemExit("Please specify type of tests to be executed (py.test -T TYPE)") + + test_type_name = test_type.args[0] + if test_type_name != item.config.getoption("-T"): + pytest.skip("Not testing type %r" % test_type_name) + # Some cmk.* code is calling things like cmk. is_raw_edition() at import time # (e.g. cmk_base/default_config/notify.py) for edition specific variable @@ -75,14 +148,21 @@ def add_python_paths(): def pytest_cmdline_main(config): - # Some special tests are not executed in a site environment, but in - # virtualenv environment. The integration tests and so on are required to - # run in our runtime environment (the site). Things like unit tests just - # need a similar python environment having the required modules. - verify_virtualenv() - #if config.getoption('markexpr') in [ "packaging", "git", "html_gentest", "unit" ]: - #else: - # setup_site_and_switch_user() + """There are 2 environments for testing: + + * A real Check_MK site environment (e.g. integration tests) + * Python virtual environment (e.g. for unit tests) + + Depending on the selected "type" marker the environment is ensured + or switched here.""" + if not config.getoption("-T"): + return # missing option is handled later + + context = test_types[config.getoption("-T")] + if context == EXECUTE_IN_SITE: + setup_site_and_switch_user() + else: + verify_virtualenv() def verify_virtualenv(): diff --git a/tests/git/test_find_debug_code_web.py b/tests/git/test_find_debug_code_web.py index 4397efe..82f4fd6 100644 --- a/tests/git/test_find_debug_code_web.py +++ b/tests/git/test_find_debug_code_web.py @@ -6,9 +6,6 @@ import glob import pytest from testlib import cmk_path, cmc_path -# Mark all tests in this file to be executed in the git context -pytestmark = pytest.mark.git - def test_find_debug_code(): scanned = 0 for base_path in [ cmk_path(), cmc_path() ]: diff --git a/tests/git/test_find_debug_print.py b/tests/git/test_find_debug_print.py index b08ddc2..1c8b824 100644 --- a/tests/git/test_find_debug_print.py +++ b/tests/git/test_find_debug_print.py @@ -3,12 +3,8 @@ import os import glob -import pytest from testlib import cmk_path, cmc_path, cme_path -# Mark all tests in this file to be executed in the git context -pytestmark = pytest.mark.git - check_paths = [ "bin", "cmk_base", diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index a5a3bff..db43a85 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -3,12 +3,8 @@ import os import glob -import pytest from testlib import cmk_path -# Mark all tests in this file to be executed in the git context -pytestmark = pytest.mark.git - def is_executable(path): return os.path.isfile(path) and os.access(path, os.X_OK) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 955fd44..7a666e4 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -1,10 +1,7 @@ -import pytest import os import subprocess import re - -# Mark all tests in this file to be tests verifying build packages -pytestmark = pytest.mark.packaging +import pytest @pytest.mark.parametrize("what", [ ("rpm"), diff --git a/tests/pylint/test_pylint_check_plugins.py b/tests/pylint/test_pylint_check_plugins.py index c2efcd5..a259872 100755 --- a/tests/pylint/test_pylint_check_plugins.py +++ b/tests/pylint/test_pylint_check_plugins.py @@ -3,14 +3,10 @@ import os import sys -import pytest from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk -# Mark all tests in this file to be pylint checks -pytestmark = pytest.mark.pylint - def test_pylint_checks(pylint_test_dir): f = file(pylint_test_dir + "/cmk-checks.py", "w") diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 4430452..b72fdb1 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -3,14 +3,10 @@ import os import sys -import pytest from testlib import cmk_path, cmc_path, cme_path import testlib.pylint_cmk as pylint_cmk -# Mark all tests in this file to be pylint checks -pytestmark = pytest.mark.pylint - def test_pylint_misc(): search_paths = [ cmk_path() + "/cmk_base", diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index 6a0749d..50af9e3 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -5,14 +5,10 @@ import os import sys import glob import tempfile -import pytest from testlib import cmk_path, cmc_path, cme_path import testlib.pylint_cmk as pylint_cmk -# Mark all tests in this file to be pylint checks -pytestmark = pytest.mark.pylint - def get_web_plugin_dirs(): plugin_dirs = sorted(list(set(os.listdir(cmk_path() + "/web/plugins") + os.listdir(cmc_path() + "/web/plugins") diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 30ebce6..a896b08 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -1,7 +1,5 @@ import pytest -pytestmark = pytest.mark.unit - # Unit tests should not be executed in site. # -> Disabled site fixture for them @pytest.fixture(scope="session")

6 years, 6 months

Fixed pytest not finding conftest.py during integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: abc519958aaab19fe55a13b9bf791d199514f911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc519958aaab1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 27 13:04:35 2018 +0200 Fixed pytest not finding conftest.py during integration tests Change-Id: I2691da32b38688a6a3c0e7440e73a950e79c3abe --- tests/testlib/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 459033d..28077e6 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -768,7 +768,13 @@ class Site(object): env_var_str = " ".join([ "%s=%s" % (k, pipes.quote(v)) for k, v in env_vars.items() ]) + " " - cmd = env_var_str + subprocess.list2cmdline(["python", self.path("local/bin/py.test")] + sys.argv[1:] + [ cmk_path() + "/tests" ]) + cmd_parts = [ + "python", self.path("local/bin/py.test"), + ] + sys.argv[1:] + + cmd = "cd %s && " % pipes.quote(cmk_path()) + cmd += env_var_str + subprocess.list2cmdline(cmd_parts) + print cmd args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ] return subprocess.call(args)

6 years, 6 months

Tests: Prepare for better unit test support

by Lars Michelsen

Module: check_mk Branch: master Commit: fcfc55f24c335a737109bf7b92f162c3dd752875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcfc55f24c335a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 17:19:14 2018 +0100 Tests: Prepare for better unit test support * Patch cmk.omd_version() which tries to access some site specific file. It's called at import time by some cmk_base.default_config module. * Also patch some cmk.paths.* variables to make the unit tests be able to load some things directly from the git, e.g. the checks or man pages * Add import path for our livestatus module (livestatus/api/python) Change-Id: I0532e4777d64b473e9826fcc9aae7744b075e13b --- tests/conftest.py | 57 +++++++++++++++++++++++++++++++++++++++++++---- tests/testlib/__init__.py | 25 ++++++++++++--------- 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index a7c93d8..4478ddf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,9 +2,53 @@ import os import pwd import pytest +import _pytest.monkeypatch import sys import glob import testlib +import tempfile +import shutil +import errno + +# Some cmk.* code is calling things like cmk. is_raw_edition() at import time +# (e.g. cmk_base/default_config/notify.py) for edition specific variable +# defaults. In integration tests we want to use the exact version of the +# site. For unit tests we assume we are in Enterprise Edition context. +def fake_version_and_paths(): + if is_running_as_site_user(): + return + + monkeypatch = _pytest.monkeypatch.MonkeyPatch() + tmp_dir = tempfile.mkdtemp(prefix="pytest_cmk_") + + import cmk + monkeypatch.setattr(cmk, "omd_version", lambda: "%s.cee" % cmk.__version__) + + monkeypatch.setattr("cmk.paths.checks_dir", "%s/checks" % cmk_path()) + monkeypatch.setattr("cmk.paths.notifications_dir", "%s/notifications" % cmk_path()) + monkeypatch.setattr("cmk.paths.inventory_dir", "%s/inventory" % cmk_path()) + monkeypatch.setattr("cmk.paths.check_manpages_dir", "%s/checkman" % cmk_path()) + monkeypatch.setattr("cmk.paths.tmp_dir", tmp_dir) + + +# Cleanup temporary directory created above +(a)pytest.fixture(scope="session", autouse=True) +def cleanup_cmk(): + yield + + if is_running_as_site_user(): + return + + import cmk.paths + + if "pytest_cmk_" not in cmk.paths.tmp_dir: + return + + try: + shutil.rmtree(cmk.paths.tmp_dir) + except OSError as exc: + if exc.errno != errno.ENOENT: + raise # re-raise exception def cmk_path(): @@ -25,19 +69,23 @@ def add_python_paths(): # make the repo directory available (cmk lib) sys.path.insert(0, cmk_path()) + # if not running as site user, make the livestatus module available + if not is_running_as_site_user(): + sys.path.insert(0, os.path.join(cmk_path(), "livestatus/api/python")) + def pytest_cmdline_main(config): # Some special tests are not executed in a site environment - if config.getoption('markexpr') in [ "packaging", "git", "html_gentest" ]: + if config.getoption('markexpr') in [ "packaging", "git", "html_gentest", "unit" ]: return setup_site_and_switch_user() -def setup_site_and_switch_user(): - def is_running_as_site_user(): - return pwd.getpwuid(os.getuid()).pw_name == _site_id() +def is_running_as_site_user(): + return pwd.getpwuid(os.getuid()).pw_name == _site_id() +def setup_site_and_switch_user(): if is_running_as_site_user(): return # This is executed as site user. Nothing to be done. @@ -103,6 +151,7 @@ def _site_id(): # add_python_paths() +fake_version_and_paths() # Session fixtures must be in conftest.py to work properly @pytest.fixture(scope="session", autouse=True) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 0a3c924..459033d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -589,15 +589,20 @@ class Site(object): def _install_test_python_modules(self): - for file_name in os.listdir("/usr/local/lib/python2.7/dist-packages"): - target_path = self.path("local/lib/python/"+file_name) - if not os.path.exists(target_path): - assert os.system("sudo ln -s /usr/local/lib/python2.7/dist-packages/%s %s" % - (file_name, target_path)) >> 8 == 0 - #assert self.execute(["pip", "install", - # "-r", os.path.join(cmk_path(), "tests", "requirements.txt"), - # "-r", os.path.join(cmk_path(), "tests", "pylint", "requirements.txt"), - # ]).wait() == 0 + python_home = os.environ.get("VIRTUAL_ENV") + bin_dir = os.path.join(python_home, "bin") + packages_dir = os.path.join(python_home, "lib/python2.7/site-packages") + + for file_name in os.listdir(packages_dir): + #if "cffi" in file_name: + # continue + + assert os.system("sudo rsync -a --chown %s:%s %s %s/local/lib/python/" % + (self.id, self.id, os.path.join(packages_dir, file_name), self.root)) >> 8 == 0 + + for file_name in [ "py.test", "pytest" ]: + assert os.system("sudo rsync -a --chown %s:%s %s %s/local/bin" % + (self.id, self.id, os.path.join(bin_dir, file_name), self.root)) >> 8 == 0 def rm_if_not_reusing(self): @@ -763,7 +768,7 @@ class Site(object): env_var_str = " ".join([ "%s=%s" % (k, pipes.quote(v)) for k, v in env_vars.items() ]) + " " - cmd = env_var_str + subprocess.list2cmdline(["python"] + sys.argv + [ cmk_path() + "/tests" ]) + cmd = env_var_str + subprocess.list2cmdline(["python", self.path("local/bin/py.test")] + sys.argv[1:] + [ cmk_path() + "/tests" ]) args = [ "/usr/bin/sudo", "--", "/bin/su", "-l", self.id, "-c", cmd ] return subprocess.call(args)

6 years, 6 months

Introduce Pipfile for managing the virtual environment

by Lars Michelsen

Module: check_mk Branch: master Commit: fcab577c2649c9fa05d28b5e8816d5cc2c7be85d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcab577c2649c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 21 20:34:05 2018 +0100 Introduce Pipfile for managing the virtual environment * The virtual environment is used for executing Check_MK tests in a deterministic environment on all platforms (CI server and developer systems). * The virtual environment includes all Python runtime and development dependencies of Check_MK. For the moment the list of modules is duplicated with the omd/packages/python-modules/Makefile definition. We need to find a clean way to reduce the duplication. * This change also introduces a configuration file for the direnv tool which is used to automatically switch into the virtual environment context once changing to the Check_MK directory. To make use of it run "make setup" in the git base directory and add this to your bashrc file: eval "$(direnv hook bash)" show_virtual_env() { if [ -n "$VIRTUAL_ENV" ]; then echo "($(basename $VIRTUAL_ENV))" fi } export -f show_virtual_env PS1='$(show_virtual_env)'$PS1 Change-Id: Ia5ffaa269c91655e2766b4b49136ccd4bac89b12 --- .envrc | 2 + Makefile | 14 +- Pipfile | 63 +++ Pipfile.lock | 1058 +++++++++++++++++++++++++++++++++++++++++ tests/Makefile | 9 - tests/conftest.py | 21 +- tests/pylint/Makefile | 7 - tests/pylint/requirements.txt | 2 - tests/requirements.txt | 11 - 9 files changed, 1152 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fcab577c26…

6 years, 6 months

pylint: Temporarily disable mod_python checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 87137b695e78c5ddeb9065ca0dfbeca6780b9eb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87137b695e78c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 26 10:12:36 2018 +0200 pylint: Temporarily disable mod_python checks The mod_python modules are not available in venv. For the 1.5 this change should be OK. This issue will be cleaned up during 1.6 development. Change-Id: I8836f11a372393a8a5adf3d3ca8392df573ec35c --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/index.py | 2 +- web/htdocs/modules.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index b69cced..a0d8f27 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from mod_python import Cookie, util, apache +from mod_python import Cookie, util, apache # pylint: disable=import-error from lib import make_utf8, MKGeneralException, MKException from log import logger import htmllib diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 099073d..de45149 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from mod_python import apache +from mod_python import apache # pylint: disable=import-error import sys, os, pprint, __builtin__ import traceback diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index 6bf3879..05ae9ce 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -27,7 +27,7 @@ import os from types import ModuleType from lib import load_web_plugins, local_web_plugins_have_changed -from mod_python.apache import import_module +from mod_python.apache import import_module # pylint: disable=import-error import pagetypes # Register non page specific modules which are not having own pages,

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018