Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove tests incompatible with werkzeug 2.3.0 (#6257)" (#6266)

Browse Source 
This reverts commit da39d2103c.
This commit is contained in:
Bert Blommers 2023-04-28 14:38:04 +00:00 committed by GitHub
parent f38babb026
commit 2cd773fe95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/moto_server/werkzeug_app.py
View File

@ -201,7 +201,7 @@ class DomainDispatcherApplication:
finally: finally:
if body: if body:
# We've consumed the body = need to reset it # We've consumed the body = need to reset it
environ["wsgi.input"] = io.StringIO(body) environ["wsgi.input"] = io.BytesIO(body.encode("utf-8"))
return body return body
def get_service_from_body( def get_service_from_body(

1
tests/test_core/test_account_id_resolution.py
View File

@ -57,6 +57,7 @@ class TestAccountIdResolution:
headers = { headers = {
"Authorization": "AWS4-HMAC-SHA256 Credential=abcd/20010101/us-east-2/sts/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=...", "Authorization": "AWS4-HMAC-SHA256 Credential=abcd/20010101/us-east-2/sts/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=...",
"Content-Length": f"{len(data)}", "Content-Length": f"{len(data)}",
"Content-Type": "application/x-www-form-urlencoded",
} }
headers.update(extra_headers or {}) headers.update(extra_headers or {})
return requests.post(f"{BASE_URL}", headers=headers, data=data) return requests.post(f"{BASE_URL}", headers=headers, data=data)

0
tests/test_moto_api/recorder/__init__.py Normal file
View File

10
tests/test_moto_api/recorder/test_recorder.py
View File

@ -1,3 +1,4 @@
import base64
import boto3 import boto3
import json import json
import requests import requests
@ -81,8 +82,13 @@ class TestRecorder(TestCase):
content = json.loads(self._download_recording()) content = json.loads(self._download_recording())
content.should.have.key("body").should.contain("Action=RunInstances") if content.get("body_encoded"):
content.should.have.key("body").should.contain(f"ImageId={EXAMPLE_AMI_ID}") body = base64.b64decode(content.get("body")).decode("ascii")
else:
body = content["body"]
body.should.contain("Action=RunInstances")
body.should.contain(f"ImageId={EXAMPLE_AMI_ID}")
def test_multiple_services(self): def test_multiple_services(self):
self._start_recording() self._start_recording()

6
tests/test_s3/test_server.py
View File

@ -36,12 +36,8 @@ def test_s3_server_get():
res.data.should.contain(b"ListAllMyBucketsResult") res.data.should.contain(b"ListAllMyBucketsResult")
@pytest.mark.parametrize("key_name", ["bar_baz", "baz bar"]) @pytest.mark.parametrize("key_name", ["bar_baz", "bar+baz", "baz bar"])
def test_s3_server_bucket_create(key_name): def test_s3_server_bucket_create(key_name):
# Very similar test in test_s3.py::test_get_object_versions_with_prefix
# That test also includes a key containing a +, such as 'baz+bar'
# We cannot test that example here, because Werkzeug (as of 2.3.0) will helpfully normalize that to `baz bar`
# TODO: re-enable this key-name if/when we ever replace Werkzeug
test_client = authenticated_client() test_client = authenticated_client()
res = test_client.put("/", "http://foobaz.localhost:5000/") res = test_client.put("/", "http://foobaz.localhost:5000/")