From 6d4d8df68717780239fad273dd722359db10e64b Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 24 Sep 2012 13:07:15 -0400
Subject: expanded pylint tests

---
 testsuite/Testsrc/testmisc.py | 9 +++++++--
 testsuite/pylintrc.conf       | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/Testsrc/testmisc.py b/testsuite/Testsrc/testmisc.py
index 5f84d00bf..3ea80310e 100644
--- a/testsuite/Testsrc/testmisc.py
+++ b/testsuite/Testsrc/testmisc.py
@@ -38,7 +38,11 @@ class TestPylint(Bcfg2TestCase):
     # <directory> => <file globs within that directory>.  <directory>
     # is relative to src/
     whitelist = {
-        "lib/Bcfg2/Server": ["Plugin"],
+        "lib/Bcfg2/Server": ["Lint",
+                             "Plugin",
+                             "BuiltinCore.py",
+                             "CherryPyCore.py",
+                             "Core.py"],
         "lib/Bcfg2/Server/Plugins": ["PuppetENC.py",
                                      "Rules.py",
                                      "DBStats.py",
@@ -60,7 +64,8 @@ class TestPylint(Bcfg2TestCase):
                                      "Svn2.py",
                                      "Bzr.py",
                                      "Cfg",
-                                     "Packages"]
+                                     "Packages"],
+        "lib/Bcfg2/Client/Tools": ["POSIX"],
         }
 
     pylint_cmd = ["pylint", "--rcfile", rcfile]
diff --git a/testsuite/pylintrc.conf b/testsuite/pylintrc.conf
index 29e35135c..014a94de5 100644
--- a/testsuite/pylintrc.conf
+++ b/testsuite/pylintrc.conf
@@ -33,7 +33,7 @@ load-plugins=
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-disable=W0142,W0511,W0603,R0201,R0901,R0903,R0904,R0921,R0922,C0302,I0011
+disable=W0142,W0511,W0603,R0201,R0901,R0902,R0903,R0904,R0921,R0922,C0302,I0011
 
 
 [REPORTS]
@@ -162,14 +162,14 @@ attr-rgx=(Entries|[a-z_][a-z0-9_]{2,30})$
 argument-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct variable names
-variable-rgx=(rv|el|fd|[a-z_][a-z0-9_]{2,30})$
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct list comprehension /
 # generator expression variable names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
+good-names=_,rv,el,fd,ca
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
-- 
cgit v1.2.3-1-g7c22