[checkmk-commits] Changed imports of tests to new module names

Module: check_mk Branch: master Commit: df3833933674fe98deb3b700604db244e84bce22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df3833933674fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 13:56:34 2018 +0200 Changed imports of tests to new module names Change-Id: I4a1de93c327ed11fcbeed501644c43eb9786aef8 --- tests/integration/web/test_backup.py | 2 +- tests/unit/web/old/test_integration.py | 5 +++-- tests/unit/web/test_htmllib_Encoder.py | 2 +- tests/unit/web/test_htmllib_TimeoutManager.py | 2 +- tests/unit/web/test_htmllib_TransactionManager.py | 2 +- tests/unit/web/test_table.py | 5 +++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/integration/web/test_backup.py b/tests/integration/web/test_backup.py index df977fe..7926673 100644 --- a/tests/integration/web/test_backup.py +++ b/tests/integration/web/test_backup.py @@ -4,7 +4,7 @@ def test_backup_key_create_web(site, monkeypatch): if site.file_exists("etc/check_mk/backup_keys.mk"): site.delete_file("etc/check_mk/backup_keys.mk") - import wato + import cmk.gui.wato as wato mode = wato.ModeBackupEditKey() try: diff --git a/tests/unit/web/old/test_integration.py b/tests/unit/web/old/test_integration.py index b5ac3b6..b3555bf 100644 --- a/tests/unit/web/old/test_integration.py +++ b/tests/unit/web/old/test_integration.py @@ -6,6 +6,7 @@ from classes import HTMLTester from html_tests import load_html_test +from cmk.gui.htmllib import HTML def run_tests(function_name, tests=None): tests = load_html_test(function_name) @@ -43,7 +44,7 @@ def test_popup_trigger(): def test_header(monkeypatch): - import config + import cmk.gui.config as config monkeypatch.setattr(config, "custom_style_sheet", None, raising=False) for function_name in ["default_html_headers", "top_heading", "top_heading_left", "top_heading_right", "html_head", "header"]: @@ -73,7 +74,7 @@ def test_context_buttons(): def test_body_foot(monkeypatch): - import config + import cmk.gui.config as config monkeypatch.setattr(config, "custom_style_sheet", None, raising=False) for function_name in ["body_start", "html_foot"]: diff --git a/tests/unit/web/test_htmllib_Encoder.py b/tests/unit/web/test_htmllib_Encoder.py index 4f51047..cbd3a1d 100644 --- a/tests/unit/web/test_htmllib_Encoder.py +++ b/tests/unit/web/test_htmllib_Encoder.py @@ -3,7 +3,7 @@ import pytest -import htmllib +import cmk.gui.htmllib as htmllib def test_htmllib_integration(register_builtin_html): assert type(html.encoder) == htmllib.Encoder diff --git a/tests/unit/web/test_htmllib_TimeoutManager.py b/tests/unit/web/test_htmllib_TimeoutManager.py index f451f2d..ab61e57 100644 --- a/tests/unit/web/test_htmllib_TimeoutManager.py +++ b/tests/unit/web/test_htmllib_TimeoutManager.py @@ -3,7 +3,7 @@ import time import pytest -import htmllib +import cmk.gui.htmllib as htmllib from cmk.gui.exceptions import RequestTimeout def test_htmllib_integration(register_builtin_html): diff --git a/tests/unit/web/test_htmllib_TransactionManager.py b/tests/unit/web/test_htmllib_TransactionManager.py index 6c92682..9063204 100644 --- a/tests/unit/web/test_htmllib_TransactionManager.py +++ b/tests/unit/web/test_htmllib_TransactionManager.py @@ -4,7 +4,7 @@ import pytest import time import cmk.gui.http as http -import htmllib +import cmk.gui.htmllib as htmllib @pytest.fixture() def tm(): diff --git a/tests/unit/web/test_table.py b/tests/unit/web/test_table.py index 54dfc15..c456997 100644 --- a/tests/unit/web/test_table.py +++ b/tests/unit/web/test_table.py @@ -7,7 +7,8 @@ import pytest from tools import compare_html, gentest, compare_and_empty, bcolors -import htmllib +from cmk.gui.i18n import _ +import cmk.gui.htmllib as htmlllib import cmk.gui.http as http import cmk.gui.table as table from cmk.gui.table import Table @@ -165,7 +166,7 @@ def test_table_cubical(register_builtin_html, monkeypatch, sortable, searchable, # TODO: Better mock the access to save_user in table.* def save_user_mock(name, data, user, unlock=False): pass - import config + import cmk.gui.config as config monkeypatch.setattr(config, "save_user_file", save_user_mock) # Test data