Module: check_mk
Branch: master
Commit: d07d8efb70682010d503c7e7f4b0fff3d3ac30eb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d07d8efb706820…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 2 13:01:30 2017 +0100
Simplified pylint test calls
Change-Id: I1271ad8ebe6f177cb02a6081c4808d214f84357e
---
tests/Makefile | 7 +------
tests/conftest.py | 4 ++--
tests/testlib/__init__.py | 2 +-
tests/testlib/pylint_cmk.py | 14 ++------------
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 78fe27b..56dca32 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -19,12 +19,7 @@ test-pylint:
test-pylint-ci:
export TERM="linux" ; \
export PYLINT_ARGS="--output-format=cmk_parseable" ; \
- export PYLINT_OUTPUT="$$WORKDIR/pylint.log" ; \
- echo -n > "$$PYLINT_OUTPUT" ; \
- $(MAKE) test-pylint ; \
- echo "### PYLINT LOG ###############################################" ; \
- cat "$$PYLINT_OUTPUT" ; \
- echo "##############################################################"
+ $(MAKE) test-pylint
test-bandit:
diff --git a/tests/conftest.py b/tests/conftest.py
index 1666bc6..0ae62d3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -83,14 +83,14 @@ def setup_site_and_switch_user():
sys.stdout.write("Switching to site context\n")
sys.stdout.write("===============================================\n")
- site.switch_to_site_user()
+ exit_code = site.switch_to_site_user()
sys.stdout.write("===============================================\n")
sys.stdout.write("Cleaning up after testing\n")
sys.stdout.write("===============================================\n")
site.rm_if_not_reusing()
- sys.exit(0)
+ sys.exit(exit_code)
def _get_site_object():
diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py
index f3ae0f6..4d4002b 100644
--- a/tests/testlib/__init__.py
+++ b/tests/testlib/__init__.py
@@ -460,7 +460,7 @@ class Site(object):
def switch_to_site_user(self):
cmd = subprocess.list2cmdline(sys.argv + [ cmk_path() + "/tests" ])
args = [ "/usr/bin/sudo", "--", "/bin/su",
"-l", self.id, "-c", cmd ]
- subprocess.call(args)
+ return subprocess.call(args)
# This opens a currently free TCP port and remembers it in the object for later use
diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py
index ba84684..9169692 100644
--- a/tests/testlib/pylint_cmk.py
+++ b/tests/testlib/pylint_cmk.py
@@ -97,7 +97,6 @@ def run_pylint(base_path, check_files=None, cleanup_test_dir=False):
pylint_args = os.environ.get("PYLINT_ARGS", "")
if pylint_args:
pylint_args += " "
- pylint_output = os.environ.get("PYLINT_OUTPUT")
pylint_cfg = repo_path() + "/pylintrc"
@@ -109,17 +108,8 @@ def run_pylint(base_path, check_files=None, cleanup_test_dir=False):
os.putenv("TEST_PATH", repo_path() + "/tests")
cmd = "pylint --rcfile=\"%s\" %s%s" % (pylint_cfg, pylint_args,
" ".join(check_files))
print("Running pylint with: %s" % cmd)
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- shell=True, cwd=base_path)
- stdout = p.communicate()[0]
-
- if stdout.strip():
- if pylint_output:
- file(pylint_output, "a").write(stdout)
- else:
- print(stdout)
-
- exit_code = p.returncode
+ p = subprocess.Popen(cmd, shell=True, cwd=base_path)
+ exit_code = p.wait()
print("Finished with exit code: %d" % exit_code)
if exit_code == 0 and cleanup_test_dir: