Merge branch 'master' into asgi-refactor-attempt

tests/test_blueprints.py

@@ -687,3 +687,49 @@ def test_register_blueprint(app, debug):
         "version 1.0.  Please use the blueprint method"
         " instead"
     )
+
+
+def test_strict_slashes_behavior_adoption(app):
+    app.strict_slashes = True
+
+    @app.get("/test")
+    def handler_test(request):
+        return text("Test")
+
+    assert app.test_client.get("/test")[1].status == 200
+    assert app.test_client.get("/test/")[1].status == 404
+
+    bp = Blueprint("bp")
+
+    @bp.get("/one", strict_slashes=False)
+    def one(request):
+        return text("one")
+
+    @bp.get("/second")
+    def second(request):
+        return text("second")
+
+    app.blueprint(bp)
+
+    assert app.test_client.get("/one")[1].status == 200
+    assert app.test_client.get("/one/")[1].status == 200
+
+    assert app.test_client.get("/second")[1].status == 200
+    assert app.test_client.get("/second/")[1].status == 404
+
+    bp2 = Blueprint("bp2", strict_slashes=False)
+
+    @bp2.get("/third")
+    def third(request):
+        return text("third")
+
+    app.blueprint(bp2)
+    assert app.test_client.get("/third")[1].status == 200
+    assert app.test_client.get("/third/")[1].status == 200
+
+    @app.get("/f1", strict_slashes=False)
+    def f1(request):
+        return text("f1")
+
+    assert app.test_client.get("/f1")[1].status == 200
+    assert app.test_client.get("/f1/")[1].status == 200

tests/test_logo.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 
 from sanic.config import BASE_LOGO
+from sanic.testing import PORT
 
 
 try:
@@ -13,7 +14,9 @@ except BaseException:
 
 
 def test_logo_base(app, caplog):
-    server = app.create_server(debug=True, return_asyncio_server=True)
+    server = app.create_server(
+        debug=True, return_asyncio_server=True, port=PORT
+    )
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     loop._stopping = False
@@ -32,7 +35,9 @@ def test_logo_base(app, caplog):
 def test_logo_false(app, caplog):
     app.config.LOGO = False
 
-    server = app.create_server(debug=True, return_asyncio_server=True)
+    server = app.create_server(
+        debug=True, return_asyncio_server=True, port=PORT
+    )
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     loop._stopping = False
@@ -45,13 +50,17 @@ def test_logo_false(app, caplog):
     app.stop()
 
     assert caplog.record_tuples[ROW][1] == logging.INFO
-    assert caplog.record_tuples[ROW][2] == "Goin' Fast @ http://127.0.0.1:8000"
+    assert caplog.record_tuples[ROW][
+        2
+    ] == "Goin' Fast @ http://127.0.0.1:{}".format(PORT)
 
 
 def test_logo_true(app, caplog):
     app.config.LOGO = True
 
-    server = app.create_server(debug=True, return_asyncio_server=True)
+    server = app.create_server(
+        debug=True, return_asyncio_server=True, port=PORT
+    )
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     loop._stopping = False
@@ -70,7 +79,9 @@ def test_logo_true(app, caplog):
 def test_logo_custom(app, caplog):
     app.config.LOGO = "My Custom Logo"
 
-    server = app.create_server(debug=True, return_asyncio_server=True)
+    server = app.create_server(
+        debug=True, return_asyncio_server=True, port=PORT
+    )
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     loop._stopping = False

tests/test_request_stream.py

@@ -1,4 +1,6 @@
+import pytest
 from sanic.blueprints import Blueprint
+from sanic.exceptions import HeaderExpectationFailed
 from sanic.request import StreamBuffer
 from sanic.response import stream, text
 from sanic.views import CompositionView, HTTPMethodView
@@ -40,6 +42,38 @@ def test_request_stream_method_view(app):
     assert response.text == data
 
 
+@pytest.mark.parametrize("headers, expect_raise_exception", [
+({"EXPECT": "100-continue"}, False),
+({"EXPECT": "100-continue-extra"}, True),
+])
+def test_request_stream_100_continue(app, headers, expect_raise_exception):
+    class SimpleView(HTTPMethodView):
+
+        @stream_decorator
+        async def post(self, request):
+            assert isinstance(request.stream, StreamBuffer)
+            result = ""
+            while True:
+                body = await request.stream.read()
+                if body is None:
+                    break
+                result += body.decode("utf-8")
+            return text(result)
+
+    app.add_route(SimpleView.as_view(), "/method_view")
+
+    assert app.is_request_stream is True
+
+    if not expect_raise_exception:
+        request, response = app.test_client.post("/method_view", data=data, headers={"EXPECT": "100-continue"})
+        assert response.status == 200
+        assert response.text == data
+    else:
+        with pytest.raises(ValueError) as e:
+            app.test_client.post("/method_view", data=data, headers={"EXPECT": "100-continue-extra"})
+            assert "Unknown Expect: 100-continue-extra" in str(e)
+
+
 def test_request_stream_app(app):
     """for self.is_request_stream = True and decorators"""
 

tests/test_server_events.py

@@ -85,7 +85,7 @@ async def test_trigger_before_events_create_server(app):
     async def init_db(app, loop):
         app.db = MySanicDb()
 
-    await app.create_server(debug=True, return_asyncio_server=True)
+    await app.create_server(debug=True, return_asyncio_server=True, port=PORT)
 
     assert hasattr(app, "db")
     assert isinstance(app.db, MySanicDb)