From 9eb3db849ba11ac49ced872a585f001bad3d8384 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 3 Oct 2012 15:27:34 -0400
Subject: prompt for locations of bcfg2 keypair in Init, using sane OS defaults

---
 testsuite/Testsrc/test_code_checks.py | 17 ++++++++++++++++-
 testsuite/pylintrc.conf               |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py
index 76f84912a..ac4183576 100644
--- a/testsuite/Testsrc/test_code_checks.py
+++ b/testsuite/Testsrc/test_code_checks.py
@@ -37,6 +37,7 @@ contingent_checks = {
     ("django",): {"lib/Bcfg2/Server": ["Reports",
                                        "SchemaUpdater",
                                        "models.py"],
+                  "lib/Bcfg2/Server/Admin": ["Reports.py", "Syncdb.py"],
                   "sbin": ["bcfg2-reports"]},
     ("pyinotify",): {"lib/Bcfg2/Server/FileMonitor": ["Inotify.py"]},
     ("yum",): {"lib/Bcfg2/Client/Tools": ["YUM*"]},
@@ -55,7 +56,21 @@ contingent_checks = {
 error_checks = {
     "sbin": ["bcfg2-build-reports", "bcfg2-admin", "bcfg2-reports"],
     "lib/Bcfg2": ["Proxy.py", "SSLServer.py"],
-    "lib/Bcfg2/Server": ["Admin", "Reports", "SchemaUpdater"],
+    "lib/Bcfg2/Server": ["Reports", "SchemaUpdater"],
+    "lib/Bcfg2/Server/Admin": ["Backup.py",
+                               "Bundle.py",
+                               "Client.py",
+                               "Compare.py",
+                               "Minestruct.py",
+                               "Perf.py",
+                               "Pull.py",
+                               "Query.py",
+                               "Reports.py",
+                               "Snapshots.py",
+                               "Syncdb.py",
+                               "Tidy.py",
+                               "Viz.py",
+                               "Xcmd.py"],
     "lib/Bcfg2/Client/Tools": ["launchd.py",
                                "OpenCSW.py",
                                "Blast.py",
diff --git a/testsuite/pylintrc.conf b/testsuite/pylintrc.conf
index de5db87f3..69b98b16e 100644
--- a/testsuite/pylintrc.conf
+++ b/testsuite/pylintrc.conf
@@ -214,7 +214,7 @@ no-docstring-rgx=__.*__|main
 [IMPORTS]
 
 # Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+deprecated-modules=regsub,TERMIOS,Bastion,rexec
 
 # Create a graph of every (i.e. internal and external) dependencies in the
 # given file (report RP0402 must not be disabled)
-- 
cgit v1.2.3-1-g7c22