test fix: gather sessions deterministically to check order

Author: fselmo

tests/core/utilities/test_http_session_manager.py

@@ -342,7 +342,7 @@ async def test_session_manager_async_json_make_get_request(
     response = await http_session_manager.async_json_make_get_request(TEST_URI)
     assert response == json.dumps({"data": "content"})
     assert len(http_session_manager.session_cache) == 1
-    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    cache_key = generate_cache_key(f"{id(asyncio.get_event_loop())}:{TEST_URI}")
     session = http_session_manager.session_cache.get_cache_entry(cache_key)
     assert isinstance(session, ClientSession)
     session.get.assert_called_once_with(
@@ -367,7 +367,7 @@ async def test_session_manager_async_json_make_post_request(
     )
     assert response == json.dumps({"data": "content"})
     assert len(http_session_manager.session_cache) == 1
-    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    cache_key = generate_cache_key(f"{id(asyncio.get_event_loop())}:{TEST_URI}")
     session = http_session_manager.session_cache.get_cache_entry(cache_key)
     assert isinstance(session, ClientSession)
     session.post.assert_called_once_with(
@@ -391,7 +391,7 @@ async def test_session_manager_async_make_post_request(mocker, http_session_mana
     )
     assert response == "content"
     assert len(http_session_manager.session_cache) == 1
-    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    cache_key = generate_cache_key(f"{id(asyncio.get_event_loop())}:{TEST_URI}")
     session = http_session_manager.session_cache.get_cache_entry(cache_key)
     assert isinstance(session, ClientSession)
     session.post.assert_called_once_with(
@@ -431,7 +431,7 @@ async def test_session_manager_async_precached_session(http_session_manager):
 
 
 @pytest.mark.asyncio
-async def test_session_manager_async_cache_does_not_close_session_before_a_call_when_multithreading(  # noqa: E501
+async def test_async_session_manager_cache_does_not_close_session_before_call(
     http_session_manager,
 ):
     # set cache size to 1 + set future session close thread time to 0.01s
@@ -442,16 +442,13 @@ async def cache_uri_and_return_session(uri):
         _session = await http_session_manager.async_cache_and_return_session(
             uri, request_timeout=ClientTimeout(_timeout_for_testing)
         )
-
         # simulate a call taking 0.01s to return a response
         await asyncio.sleep(_timeout_for_testing)
 
         assert not _session.closed
         return _session
 
-    tasks = [cache_uri_and_return_session(uri) for uri in UNIQUE_URIS]
-
-    all_sessions = await asyncio.gather(*tasks)
+    all_sessions = [await cache_uri_and_return_session(uri) for uri in UNIQUE_URIS]
     assert len(all_sessions) == len(UNIQUE_URIS)
     assert all(isinstance(s, ClientSession) for s in all_sessions)
 
@@ -530,7 +527,7 @@ async def test_session_manager_async_use_new_session_if_loop_closed_for_cached_s
     )
 
     # assert session1 was cached
-    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    cache_key = generate_cache_key(f"{id(asyncio.get_event_loop())}:{TEST_URI}")
 
     assert len(http_session_manager.session_cache) == 1
     cached_session = http_session_manager.session_cache.get_cache_entry(cache_key)
@@ -570,7 +567,7 @@ async def test_session_manager_async_use_new_session_if_session_closed_for_cache
     )
 
     # assert session1 was cached
-    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    cache_key = generate_cache_key(f"{id(asyncio.get_event_loop())}:{TEST_URI}")
 
     assert len(http_session_manager.session_cache) == 1
     cached_session = http_session_manager.session_cache.get_cache_entry(cache_key)