Merge branch '1.0.x'

This commit is contained in:
David Lord 2019-07-01 10:54:31 -07:00
commit b05a685a03
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
6 changed files with 59 additions and 28 deletions

View file

@ -483,8 +483,8 @@ class TestSendfile(object):
def test_send_file_object_without_mimetype(self, app, req_ctx):
with pytest.raises(ValueError) as excinfo:
flask.send_file(StringIO("LOL"))
assert "Unable to infer MIME-type" in str(excinfo)
assert "no filename is available" in str(excinfo)
assert "Unable to infer MIME-type" in str(excinfo.value)
assert "no filename is available" in str(excinfo.value)
flask.send_file(StringIO("LOL"), attachment_filename="filename")