test[fix]: Pass parameters to aiohttp correctly

Apparently the parameter passing in our `aiohttp` tests
were incorrect, and was depending on a `yarl` bug [1] that was fixed [2]
in `1.9.0`, and with this new yarl version, our tests started to fail.
This fix corrects the parameter passing, so we can use the latest `yarl`.

[1] aio-libs/yarl#723
[2] aio-libs/yarl#792

Signed-off-by: Ferenc Géczi <ferenc.geczi@ibm.com>

tests/frameworks/test_aiohttp_client.py

@@ -16,9 +16,9 @@
 
 class TestAiohttp(unittest.TestCase):
 
-    async def fetch(self, session, url, headers=None):
+    async def fetch(self, session, url, headers=None, params=None):
         try:
-            async with session.get(url, headers=headers) as response:
+            async with session.get(url, headers=headers, params=params) as response:
                 return response
         except aiohttp.web_exceptions.HTTPException:
             pass
@@ -296,7 +296,7 @@ def test_client_get_with_params_to_scrub(self):
         async def test():
             with async_tracer.start_active_span('test'):
                 async with aiohttp.ClientSession() as session:
-                    return await self.fetch(session, testenv["wsgi_server"] + "/?secret=yeah")
+                    return await self.fetch(session, testenv["wsgi_server"], params={"secret": "yeah"})
 
         response = self.loop.run_until_complete(test())
 

tests/frameworks/test_aiohttp_server.py

@@ -15,9 +15,9 @@
 
 class TestAiohttpServer(unittest.TestCase):
 
-    async def fetch(self, session, url, headers=None):
+    async def fetch(self, session, url, headers=None, params=None):
         try:
-            async with session.get(url, headers=headers) as response:
+            async with session.get(url, headers=headers, params=params) as response:
                 return response
         except aiohttp.web_exceptions.HTTPException:
             pass
@@ -185,7 +185,7 @@ def test_server_get_with_params_to_scrub(self):
         async def test():
             with async_tracer.start_active_span('test'):
                 async with aiohttp.ClientSession() as session:
-                    return await self.fetch(session, testenv["aiohttp_server"] + "/?secret=iloveyou")
+                    return await self.fetch(session, testenv["aiohttp_server"], params={"secret": "iloveyou"})
 
         response = self.loop.run_until_complete(test())
 
@@ -254,7 +254,7 @@ async def test():
                     headers['X-Capture-This'] = 'this'
                     headers['X-Capture-That'] = 'that'
 
-                    return await self.fetch(session, testenv["aiohttp_server"] + "/?secret=iloveyou", headers=headers)
+                    return await self.fetch(session, testenv["aiohttp_server"], headers=headers, params={"secret": "iloveyou"})
 
         response = self.loop.run_until_complete(test())
 

tests/frameworks/test_tornado_server.py

@@ -18,9 +18,9 @@
 
 
 class TestTornadoServer(unittest.TestCase):
-    async def fetch(self, session, url, headers=None):
+    async def fetch(self, session, url, headers=None, params=None):
         try:
-            async with session.get(url, headers=headers) as response:
+            async with session.get(url, headers=headers, params=params) as response:
                 return response
         except aiohttp.web_exceptions.HTTPException:
             pass
@@ -456,7 +456,7 @@ def test_get_with_params_to_scrub(self):
         async def test():
             with async_tracer.start_active_span('test'):
                 async with aiohttp.ClientSession() as session:
-                    return await self.fetch(session, testenv["tornado_server"] + "/?secret=yeah")
+                    return await self.fetch(session, testenv["tornado_server"], params={"secret": "yeah"})
 
         response = tornado.ioloop.IOLoop.current().run_sync(test)
 
@@ -525,7 +525,7 @@ async def test():
                     headers['X-Capture-This'] = 'this'
                     headers['X-Capture-That'] = 'that'
 
-                    return await self.fetch(session, testenv["tornado_server"] + "/?secret=iloveyou", headers=headers)
+                    return await self.fetch(session, testenv["tornado_server"], headers=headers, params={"secret": "iloveyou"})
 
         response = tornado.ioloop.IOLoop.current().run_sync(test)
 

tests/requirements-307.txt

@@ -48,4 +48,3 @@ spyne>=2.14.0
 tornado>=4.5.3,<6.0
 uvicorn>=0.13.4
 urllib3[secure]<1.27,>=1.26.5
-yarl==1.8.2

tests/requirements-310-with-tornado.txt

@@ -38,4 +38,3 @@ spyne>=2.14.0
 
 uvicorn>=0.13.4
 urllib3[secure]<1.27,>=1.26.5
-yarl==1.8.2

tests/requirements-310.txt

@@ -40,4 +40,3 @@ spyne>=2.14.0
 
 uvicorn>=0.13.4
 urllib3[secure]<1.27,>=1.26.5
-yarl==1.8.2

tests/requirements.txt

@@ -39,4 +39,3 @@ spyne>=2.14.0
 tornado>=4.5.3,<6.0
 uvicorn>=0.13.4
 urllib3[secure]<1.27,>=1.26.5
-yarl==1.8.2