summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-10 09:24:56 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-21 08:35:07 -0500
commit58cee8566fba7b48d127227d96c98549b7db3028 (patch)
treee85e4aacc564af2dae2790b09ba084728c8b003e /testsuite
parent0e98739497a243ff880d98bd24a6f7393ae13490 (diff)
downloadbcfg2-58cee8566fba7b48d127227d96c98549b7db3028.tar.gz
bcfg2-58cee8566fba7b48d127227d96c98549b7db3028.tar.bz2
bcfg2-58cee8566fba7b48d127227d96c98549b7db3028.zip
testsuite: Fixed several pylint 1.0 issues
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testsrc/test_code_checks.py2
-rw-r--r--testsuite/pylintrc.conf11
2 files changed, 11 insertions, 2 deletions
diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py
index e1214a942..98df358e7 100644
--- a/testsuite/Testsrc/test_code_checks.py
+++ b/testsuite/Testsrc/test_code_checks.py
@@ -35,7 +35,7 @@ contingent_checks = {
"lib/Bcfg2/Server/Admin": ["Reports.py", "Syncdb.py"],
"sbin": ["bcfg2-reports"]},
("pyinotify",): {"lib/Bcfg2/Server/FileMonitor": ["Inotify.py"]},
- ("yum",): {"lib/Bcfg2/Client/Tools": ["YUM*"]},
+ ("yum",): {"lib/Bcfg2/Client/Tools": ["YUM.py"]},
("genshi",): {"lib/Bcfg2/Server/Plugins/Cfg": ["CfgGenshiGenerator.py"]},
("Cheetah",): {"lib/Bcfg2/Server/Plugins/Cfg": ["CfgCheetahGenerator.py"]},
("M2Crypto",): {"lib/Bcfg2": ["Encryption.py"],
diff --git a/testsuite/pylintrc.conf b/testsuite/pylintrc.conf
index 653c68426..94904877b 100644
--- a/testsuite/pylintrc.conf
+++ b/testsuite/pylintrc.conf
@@ -99,6 +99,10 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme
# evaluation report (RP0004).
comment=no
+# Template used to display messages. This is a python new-style format string
+# used to format the massage information. See doc for all details
+msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
+
[VARIABLES]
@@ -131,6 +135,9 @@ ignore-docstrings=yes
# Maximum number of characters on a single line.
max-line-length=79
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?(<?https?://\S+>?|:(func|class):.*)$
+
# Maximum number of lines in a module
max-module-lines=1000
@@ -247,8 +254,10 @@ max-locals=20
# Maximum number of return / yield for function / method body
max-returns=6
-# Maximum number of branch for function / method body
+# Maximum number of branch for function / method body (max-branchs is
+# pylint 0.x, max-branches is 1.0)
max-branchs=18
+max-branches=18
# Maximum number of statements in function / method body
max-statements=75