Only passthrough_errors if PROPAGATE_EXCEPTIONS

See pallets/werkzeug#954
untitaker · Aug 27, 2016 · 098ea0c · 098ea0c
1 parent 71e10be
commit 098ea0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/flask/app.py b/flask/app.py
@@ -838,7 +838,8 @@ def run(self, host=None, port=None, debug=None, **options):
             self.debug = bool(debug)
         options.setdefault('use_reloader', self.debug)
         options.setdefault('use_debugger', self.debug)
-        options.setdefault('passthrough_errors', True)
+        options.setdefault('passthrough_errors',
+                           self.config['PROPAGATE_EXCEPTIONS'])
         try:
             run_simple(host, port, self, **options)
         finally:

diff --git a/flask/cli.py b/flask/cli.py
@@ -430,7 +430,7 @@ def run_command(info, host, port, reload, debugger, eager_loading,
 
     run_simple(host, port, app, use_reloader=reload,
                use_debugger=debugger, threaded=with_threads,
-               passthrough_errors=True)
+               passthrough_errors=app.config['PROPAGATE_EXCEPTIONS'])
 
 
 @click.command('shell', short_help='Runs a shell in the app context.')

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -1268,8 +1268,8 @@ def run_simple_mock(*args, **kwargs):
     monkeypatch.setattr(werkzeug.serving, 'run_simple', run_simple_mock)
     app.config['PROPAGATE_EXCEPTIONS'] = propagate_exceptions
     app.run(debug=debug, use_debugger=use_debugger, use_reloader=use_reloader)
-    # make sure werkzeug always passes errors through
-    assert rv['passthrough_errors']
+    # make sure werkzeug passes errors through if PROPAGATE_EXCEPTIONS
+    assert rv['passthrough_errors'] == propagate_exceptions
 
 
 def test_max_content_length():