remove previously deprecated code
This commit is contained in:
parent
604de4b1dc
commit
6650764e97
16 changed files with 81 additions and 946 deletions
|
|
@ -20,7 +20,6 @@ def _standard_os_environ():
|
|||
out = (
|
||||
(os.environ, "FLASK_ENV_FILE", monkeypatch.notset),
|
||||
(os.environ, "FLASK_APP", monkeypatch.notset),
|
||||
(os.environ, "FLASK_ENV", monkeypatch.notset),
|
||||
(os.environ, "FLASK_DEBUG", monkeypatch.notset),
|
||||
(os.environ, "FLASK_RUN_FROM_CLI", monkeypatch.notset),
|
||||
(os.environ, "WERKZEUG_RUN_MAIN", monkeypatch.notset),
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ def test_async_error_handler(path, async_app):
|
|||
|
||||
|
||||
def test_async_before_after_request():
|
||||
app_first_called = False
|
||||
app_before_called = False
|
||||
app_after_called = False
|
||||
bp_before_called = False
|
||||
|
|
@ -107,13 +106,6 @@ def test_async_before_after_request():
|
|||
def index():
|
||||
return ""
|
||||
|
||||
with pytest.deprecated_call():
|
||||
|
||||
@app.before_first_request
|
||||
async def before_first():
|
||||
nonlocal app_first_called
|
||||
app_first_called = True
|
||||
|
||||
@app.before_request
|
||||
async def before():
|
||||
nonlocal app_before_called
|
||||
|
|
@ -146,7 +138,6 @@ def test_async_before_after_request():
|
|||
|
||||
test_client = app.test_client()
|
||||
test_client.get("/")
|
||||
assert app_first_called
|
||||
assert app_before_called
|
||||
assert app_after_called
|
||||
test_client.get("/bp/")
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
import gc
|
||||
import re
|
||||
import time
|
||||
import uuid
|
||||
import warnings
|
||||
import weakref
|
||||
from datetime import datetime
|
||||
from datetime import timezone
|
||||
from platform import python_implementation
|
||||
from threading import Thread
|
||||
|
||||
import pytest
|
||||
import werkzeug.serving
|
||||
|
|
@ -1667,43 +1665,6 @@ def test_no_setup_after_first_request(app, client):
|
|||
assert "setup method 'add_url_rule'" in str(exc_info.value)
|
||||
|
||||
|
||||
def test_before_first_request_functions(app, client):
|
||||
got = []
|
||||
|
||||
with pytest.deprecated_call():
|
||||
|
||||
@app.before_first_request
|
||||
def foo():
|
||||
got.append(42)
|
||||
|
||||
client.get("/")
|
||||
assert got == [42]
|
||||
client.get("/")
|
||||
assert got == [42]
|
||||
assert app.got_first_request
|
||||
|
||||
|
||||
def test_before_first_request_functions_concurrent(app, client):
|
||||
got = []
|
||||
|
||||
with pytest.deprecated_call():
|
||||
|
||||
@app.before_first_request
|
||||
def foo():
|
||||
time.sleep(0.2)
|
||||
got.append(42)
|
||||
|
||||
def get_and_assert():
|
||||
client.get("/")
|
||||
assert got == [42]
|
||||
|
||||
t = Thread(target=get_and_assert)
|
||||
t.start()
|
||||
get_and_assert()
|
||||
t.join()
|
||||
assert app.got_first_request
|
||||
|
||||
|
||||
def test_routing_redirect_debugging(monkeypatch, app, client):
|
||||
app.config["DEBUG"] = True
|
||||
|
||||
|
|
|
|||
|
|
@ -722,12 +722,6 @@ def test_app_request_processing(app, client):
|
|||
bp = flask.Blueprint("bp", __name__)
|
||||
evts = []
|
||||
|
||||
with pytest.deprecated_call():
|
||||
|
||||
@bp.before_app_first_request
|
||||
def before_first_request():
|
||||
evts.append("first")
|
||||
|
||||
@bp.before_app_request
|
||||
def before_app():
|
||||
evts.append("before")
|
||||
|
|
@ -755,12 +749,12 @@ def test_app_request_processing(app, client):
|
|||
# first request
|
||||
resp = client.get("/").data
|
||||
assert resp == b"request|after"
|
||||
assert evts == ["first", "before", "after", "teardown"]
|
||||
assert evts == ["before", "after", "teardown"]
|
||||
|
||||
# second request
|
||||
resp = client.get("/").data
|
||||
assert resp == b"request|after"
|
||||
assert evts == ["first"] + ["before", "after", "teardown"] * 2
|
||||
assert evts == ["before", "after", "teardown"] * 2
|
||||
|
||||
|
||||
def test_app_url_processors(app, client):
|
||||
|
|
|
|||
|
|
@ -302,24 +302,18 @@ class TestStreaming:
|
|||
|
||||
class TestHelpers:
|
||||
@pytest.mark.parametrize(
|
||||
"debug, expected_flag, expected_default_flag",
|
||||
("debug", "expect"),
|
||||
[
|
||||
("", False, False),
|
||||
("0", False, False),
|
||||
("False", False, False),
|
||||
("No", False, False),
|
||||
("True", True, True),
|
||||
("", False),
|
||||
("0", False),
|
||||
("False", False),
|
||||
("No", False),
|
||||
("True", True),
|
||||
],
|
||||
)
|
||||
def test_get_debug_flag(
|
||||
self, monkeypatch, debug, expected_flag, expected_default_flag
|
||||
):
|
||||
def test_get_debug_flag(self, monkeypatch, debug, expect):
|
||||
monkeypatch.setenv("FLASK_DEBUG", debug)
|
||||
if expected_flag is None:
|
||||
assert get_debug_flag() is None
|
||||
else:
|
||||
assert get_debug_flag() == expected_flag
|
||||
assert get_debug_flag() == expected_default_flag
|
||||
assert get_debug_flag() == expect
|
||||
|
||||
def test_make_response(self):
|
||||
app = flask.Flask(__name__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue