pallets upgrade

conbench · May 12, 2021 · 734476b · 734476b
1 parent 31ba8da
commit 734476b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/conbench/__init__.py b/conbench/__init__.py
@@ -71,8 +71,11 @@ def _init_api_docs(application):
 
 def _json_http_errors(e):
     import flask as f
+    from werkzeug.wrappers.response import Response as WSGIResponse
 
-    response = e.get_response()
+    # TODO: revert back to response = e.get_response() once this is fixed
+    # https://github.com/pallets/werkzeug/issues/2115
+    response = WSGIResponse("body omitted", e.code, e.get_headers(None, None))
     data = {"code": e.code, "name": e.name}
     if e.code == 400:
         data["description"] = e.description

diff --git a/conbench/tests/benchmark/test_cli.py b/conbench/tests/benchmark/test_cli.py
@@ -43,11 +43,11 @@
 
 Options:
   --iterations INTEGER   [default: 1]
-  --drop-caches BOOLEAN  [default: false]
-  --gc-collect BOOLEAN   [default: true]
-  --gc-disable BOOLEAN   [default: true]
-  --show-result BOOLEAN  [default: true]
-  --show-output BOOLEAN  [default: false]
+  --drop-caches BOOLEAN  [default: False]
+  --gc-collect BOOLEAN   [default: True]
+  --gc-disable BOOLEAN   [default: True]
+  --show-result BOOLEAN  [default: True]
+  --show-output BOOLEAN  [default: False]
   --run-id TEXT          Group executions together with a run id.
   --run-name TEXT        Name of run (commit, pull request, etc).
   --help                 Show this message and exit.
@@ -80,14 +80,14 @@
 Options:
   --color [green|pink|yellow]
   --fruit [apple|orange]
-  --all BOOLEAN                [default: false]
+  --all BOOLEAN                [default: False]
   --count INTEGER              [default: 1]
   --iterations INTEGER         [default: 1]
-  --drop-caches BOOLEAN        [default: false]
-  --gc-collect BOOLEAN         [default: true]
-  --gc-disable BOOLEAN         [default: true]
-  --show-result BOOLEAN        [default: true]
-  --show-output BOOLEAN        [default: false]
+  --drop-caches BOOLEAN        [default: False]
+  --gc-collect BOOLEAN         [default: True]
+  --gc-disable BOOLEAN         [default: True]
+  --show-result BOOLEAN        [default: True]
+  --show-output BOOLEAN        [default: False]
   --run-id TEXT                Group executions together with a run id.
   --run-name TEXT              Name of run (commit, pull request, etc).
   --help                       Show this message and exit.