googleapis
diff --git a/‎pylintrc_test_modifications‎
Lines changed: 0 additions & 8 deletions b/‎pylintrc_test_modifications‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎run_pylint.py‎
Lines changed: 27 additions & 14 deletions b/‎run_pylint.py‎
Lines changed: 27 additions & 14 deletions
@@ -20,7 +20,23 @@
 ]
 PRODUCTION_RC = 'pylintrc_default'
 TEST_RC = 'pylintrc_reduced'
-TEST_RC_MODS = 'pylintrc_test_modifications'
+TEST_DISABLED_MESSAGES = [
+    'invalid-name',
+    'missing-docstring',
+    'too-many-public-methods',
+    'too-few-public-methods',
+    'attribute-defined-outside-init',
+    'unbalanced-tuple-unpacking',
+    'too-many-locals',
+    'exec-used',
+    'no-init',
+    'no-self-use',
+]
+TEST_RC_ADDITIONS = {
+    'MESSAGES CONTROL': {
+        'disable': ', '.join(TEST_DISABLED_MESSAGES),
+    },
+}
 
 
 def read_config(filename):
@@ -31,25 +47,22 @@ def read_config(filename):
     return config
 
 
-def make_test_rc(base_rc_filename, modifications_rc_filename,
-                 target_filename):
-    """Combines a base rc and modifications into single file."""
+def make_test_rc(base_rc_filename, additions_dict, target_filename):
+    """Combines a base rc and test additions into single file."""
     main_cfg = read_config(base_rc_filename)
-    modification_cfg = read_config(modifications_rc_filename)
 
     # Create fresh config for test, which must extend production.
     test_cfg = ConfigParser.ConfigParser()
-
     test_cfg._sections = copy.deepcopy(main_cfg._sections)
-    for section, opts in modification_cfg._sections.items():
+
+    for section, opts in additions_dict.items():
         curr_section = test_cfg._sections.setdefault(
-            section, modification_cfg._dict())
+            section, test_cfg._dict())
         for opt, opt_val in opts.items():
-            if opt in curr_section:
-                if curr_section[opt] != opt_val:
-                    curr_section[opt] = ', '.join([curr_section[opt], opt_val])
-            else:
-                curr_section[opt] = opt_val
+            curr_val = curr_section.get(opt)
+            if curr_val is None:
+                raise KeyError('Expected to be adding to existing option.')
+            curr_section[opt] = '%s, %s' % (curr_val, opt_val)
 
     with open(target_filename, 'w') as file_obj:
         test_cfg.write(file_obj)
@@ -109,7 +122,7 @@ def lint_fileset(filenames, rcfile, description):
 
 def main():
     """Script entry point. Lints both sets of files."""
-    make_test_rc(PRODUCTION_RC, TEST_RC_MODS, TEST_RC)
+    make_test_rc(PRODUCTION_RC, TEST_RC_ADDITIONS, TEST_RC)
     library_files, non_library_files = get_python_files()
     lint_fileset(library_files, PRODUCTION_RC, 'library code')
     lint_fileset(non_library_files, TEST_RC, 'test and demo code')