Remove expected_return_value. Resolves pre-commit#232

asottile · asottile · commit 67ad0d2d8ec5 · 2015-11-12T13:50:29.000-08:00
diff --git a/pre_commit/clientlib/validate_manifest.py b/pre_commit/clientlib/validate_manifest.py
@@ -24,7 +24,6 @@ class InvalidManifestError(ValueError):
             'language': {'type': 'string'},
             'language_version': {'type': 'string', 'default': 'default'},
             'files': {'type': 'string'},
-            'expected_return_value': {'type': 'number', 'default': 0},
             'stages': {
                 'type': 'array',
                 'default': [],
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -87,7 +87,7 @@ def _run_single_hook(hook, repo, args, write, skips=frozenset()):
 
     retcode, stdout, stderr = repo.run_hook(hook, filenames)
 
-    if retcode != hook['expected_return_value']:
+    if retcode:
         retcode = 1
         print_color = color.RED
         pass_fail = 'Failed'
diff --git a/tests/clientlib/validate_manifest_test.py b/tests/clientlib/validate_manifest_test.py
@@ -77,7 +77,6 @@ def test_additional_manifest_failing(obj):
                 'language': 'python',
                 'language_version': 'python3.3',
                 'files': r'\.py$',
-                'expected_return_value': 0,
             }],
             True,
         ),
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -476,8 +476,7 @@ def test_local_hook_fails(
         ('hooks', [OrderedDict((
             ('id', 'no-todo'),
             ('name', 'No TODO'),
-            ('entry', 'grep -iI todo'),
-            ('expected_return_value', 1),
+            ('entry', 'sh -c "! grep -iI todo $@" --'),
             ('language', 'system'),
             ('files', ''),
         ))])
diff --git a/tests/manifest_test.py b/tests/manifest_test.py
@@ -23,7 +23,6 @@ def test_manifest_contents(manifest):
         'description': '',
         'entry': 'bin/hook.sh',
         'exclude': '^$',
-        'expected_return_value': 0,
         'files': '',
         'id': 'bash_hook',
         'language': 'script',
@@ -39,7 +38,6 @@ def test_hooks(manifest):
         'description': '',
         'entry': 'bin/hook.sh',
         'exclude': '^$',
-        'expected_return_value': 0,
         'files': '',
         'id': 'bash_hook',
         'language': 'script',
