Module: check_mk
Branch: master
Commit: 14572caa52ab8e2c19cf9e1de576fbe206129288
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14572caa52ab8e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 13 15:44:21 2018 +0200
Merged pylint_web test into pylint_misc
Change-Id: I9f903f8f8329528dcda3fc708095b0e4bdbc1897
---
tests/pylint/test_pylint_misc.py | 15 +++++++++++----
tests/pylint/test_pylint_web.py | 9 ---------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py
index ee6ac17..c06f0e9 100755
--- a/tests/pylint/test_pylint_misc.py
+++ b/tests/pylint/test_pylint_misc.py
@@ -8,24 +8,31 @@ from testlib import cmk_path, cmc_path, cme_path
import testlib.pylint_cmk as pylint_cmk
def test_pylint_misc():
+ # Only specify the path to python packages or modules here
modules_or_packages = [
+ # Check_MK base
"cmk_base",
"cmk_base/modes",
"cmk_base/automations",
"cmk_base/default_config",
"cmk_base/data_sources",
-
- "enterprise/cmk/cee",
- "enterprise/cmk/cee/liveproxy",
"enterprise/cmk_base/cee",
"enterprise/cmk_base/modes/cee.py",
"enterprise/cmk_base/automations/cee.py",
"enterprise/cmk_base/default_config/cee.py",
-
"managed/cmk_base/default_config/cme.py",
+ # cmk module level
"cmk",
"cmk/ec",
+ "enterprise/cmk/cee",
+ "enterprise/cmk/cee/liveproxy",
+
+ # GUI specific
+ "web/app/index.wsgi",
+ "cmk/gui",
+ "enterprise/cmk/gui/cee",
+ "managed/cmk/gui/cme",
]
# We use our own search logic to find scripts without python extension
diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py
deleted file mode 100755
index 4859fa6..0000000
--- a/tests/pylint/test_pylint_web.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-# encoding: utf-8
-
-from testlib import cmk_path
-import testlib.pylint_cmk as pylint_cmk
-
-def test_pylint_web():
- exit_code = pylint_cmk.run_pylint(cmk_path(), ["web/app/index.wsgi",
"cmk/gui", "enterprise/cmk/gui/cee",
"managed/cmk/gui/cme"])
- assert exit_code == 0, "PyLint found an error in the web code"