[checkmk-commits] Make GUI crawl only put files into the local site to avoid permission issues

Module: check_mk Branch: master Commit: 91dda4caec6996a7730ff38170e2d484713d3246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91dda4caec6996… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 10:10:02 2018 +0100 Make GUI crawl only put files into the local site to avoid permission issues Change-Id: I3935f763136ed7c5f8c2da49cbdeedb6c12e8bed --- tests/integration/cmk/gui/test_crawl.py | 15 ++++++++------- tests/testlib/__init__.py | 10 ---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/integration/cmk/gui/test_crawl.py b/tests/integration/cmk/gui/test_crawl.py index 5162d5a..d5f033a 100644 --- a/tests/integration/cmk/gui/test_crawl.py +++ b/tests/integration/cmk/gui/test_crawl.py @@ -13,7 +13,7 @@ import traceback from urlparse import urlsplit, parse_qsl, urlunsplit, urljoin from urllib import urlencode from bs4 import BeautifulSoup -from testlib import web, var_dir +from testlib import web from testlib import CMKWebSession @@ -303,17 +303,20 @@ class TestCrawler(object): self.report() + def var_dir(self): + return self.site.path("var/log") + def stats_file(self): - return var_dir() + "/crawl.stats" + return self.var_dir() + "/crawl.stats" def report_file(self): - return var_dir() + "/crawl.report" + return self.var_dir() + "/crawl.report" def web_log_file(self): - return var_dir() + "/crawl-web.log" + return self.var_dir() + "/crawl-web.log" def apache_error_log_file(self): - return var_dir() + "/crawl-apache_error_log.log" + return self.var_dir() + "/crawl-apache_error_log.log" def load_stats(self): try: @@ -325,8 +328,6 @@ class TestCrawler(object): raise def save_stats(self): - if not os.path.exists(var_dir()): - os.makedirs(var_dir()) file(self.stats_file() + ".tmp", "w").write(pprint.pformat(self.stats) + "\n") os.rename(self.stats_file() + ".tmp", self.stats_file()) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9aa8765..c91028b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -57,16 +57,6 @@ def cme_path(): return repo_path() + "/managed" -# Directory for persisting variable data produced by tests -def var_dir(): - if "WORKSPACE" in os.environ: - base_dir = os.environ["WORKSPACE"] + "/results" - else: - base_dir = repo_path() + "/tests/var" - - return base_dir - - def virtualenv_path(): try: venv = subprocess.check_output(["pipenv", "--bare", "--venv"])