|
 |
be127e |
From 7437d53e12b08099586546f999fbdf3cf080330b Mon Sep 17 00:00:00 2001
|
|
|
be127e |
From: Anthony Sottile <asottile@umich.edu>
|
|
|
be127e |
Date: Fri, 7 Feb 2020 09:59:23 -0800
|
|
|
be127e |
Subject: [PATCH] Fix testsuite for werkzeug 1.x
|
|
|
be127e |
|
|
|
be127e |
---
|
|
|
be127e |
tests/test_api.py | 4 +++-
|
|
|
be127e |
tests/test_reqparse.py | 4 ++--
|
|
|
be127e |
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
be127e |
|
|
|
be127e |
diff --git a/tests/test_api.py b/tests/test_api.py
|
|
|
be127e |
index f7f8e661..6795d362 100644
|
|
|
be127e |
--- a/tests/test_api.py
|
|
|
be127e |
+++ b/tests/test_api.py
|
|
|
be127e |
@@ -445,7 +445,9 @@ def test_handle_non_api_error(self):
|
|
|
be127e |
|
|
|
be127e |
resp = app.get("/foo")
|
|
|
be127e |
self.assertEquals(resp.status_code, 404)
|
|
|
be127e |
- self.assertEquals('text/html', resp.headers['Content-Type'])
|
|
|
be127e |
+ # in newer versions of werkzeug this is `text/html; charset=utf8`
|
|
|
be127e |
+ content_type, _, _ = resp.headers['Content-Type'].partition(';')
|
|
|
be127e |
+ self.assertEquals('text/html', content_type)
|
|
|
be127e |
|
|
|
be127e |
def test_non_api_error_404_catchall(self):
|
|
|
be127e |
app = Flask(__name__)
|
|
|
be127e |
diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py
|
|
|
be127e |
index 2f1fbedf..9776f17c 100644
|
|
|
be127e |
--- a/tests/test_reqparse.py
|
|
|
be127e |
+++ b/tests/test_reqparse.py
|
|
|
be127e |
@@ -2,9 +2,9 @@
|
|
|
be127e |
import unittest
|
|
|
be127e |
from mock import Mock, patch
|
|
|
be127e |
from flask import Flask
|
|
|
be127e |
-from werkzeug import exceptions, MultiDict
|
|
|
be127e |
+from werkzeug import exceptions
|
|
|
be127e |
from werkzeug.wrappers import Request
|
|
|
be127e |
-from werkzeug.datastructures import FileStorage
|
|
|
be127e |
+from werkzeug.datastructures import FileStorage, MultiDict
|
|
|
be127e |
from flask_restful.reqparse import Argument, RequestParser, Namespace
|
|
|
be127e |
import six
|
|
|
be127e |
import decimal
|