Merge pull request #513 from pre-commit/always_run_regression

asottile · web-flow · commit b89962e1dd47 · 2017-03-27T07:53:47.000-07:00
Fix regression in 0.13.5 with always_run + files
diff --git a/pre_commit/clientlib.py b/pre_commit/clientlib.py
@@ -38,7 +38,7 @@ def _make_argparser(filenames_help):
 
     schema.Conditional(
         'files', schema.check_and(schema.check_string, schema.check_regex),
-        condition_key='always_run', condition_value=False, ensure_absent=True,
+        condition_key='always_run', condition_value=False,
     ),
 
     schema.Optional(
diff --git a/tests/clientlib_test.py b/tests/clientlib_test.py
@@ -187,6 +187,20 @@ def test_validate_manifest_main(args, expected_output):
             }],
             True,
         ),
+        (
+            # A regression in 0.13.5: always_run and files are permissible
+            # together (but meaningless).  In a future version upgrade this to
+            # an error
+            [{
+                'id': 'a',
+                'name': 'b',
+                'entry': 'c',
+                'language': 'python',
+                'files': '',
+                'always_run': True,
+            }],
+            True,
+        ),
     )
 )
 def test_valid_manifests(manifest_obj, expected):
