Merged with the default branch.

1 files changed, 15 insertions, 1 deletions

diff --git a/test/test_routing.py b/test/test_routing.py
index 3649b37c..9e872061 100644
--- a/test/test_routing.py
+++ b/test/test_routing.py
@@ -1401,6 +1401,20 @@ class TestRouting(TestApplicationPython):
         self.route_match_invalid({"cookies": ["var"]})
         self.route_match_invalid({"cookies": [{"foo": {}}]})
 
+    def test_routes_match_cookies_complex(self):
+        self.route_match({"cookies": {"foo": "bar=baz"}})
+        self.cookie('foo=bar=baz', 200)
+        self.cookie('   foo=bar=baz   ', 200)
+        self.cookie('=foo=bar=baz', 404)
+
+        self.route_match({"cookies": {"foo": ""}})
+        self.cookie('foo=', 200)
+        self.cookie('foo=;', 200)
+        self.cookie('  foo=;', 200)
+        self.cookie('foo', 404)
+        self.cookie('', 404)
+        self.cookie('=', 404)
+
     def test_routes_match_cookies_multiple(self):
         self.route_match({"cookies": {"foo": "bar", "blah": "blah"}})
 
@@ -1471,7 +1485,7 @@ class TestRouting(TestApplicationPython):
 
     def test_routes_source_port(self):
         def sock_port():
-            _, sock = self.http(b'', start=True, raw=True, no_recv=True)
+            sock = self.http(b'', raw=True, no_recv=True)
             port = sock.getsockname()[1]
             return (sock, port)