ensure more resources are closed in tests

this gets rid of a good amount of ResourceWarnings

Author: Nothing4You

tests/conftest.py

@@ -349,6 +349,7 @@ def mysql_server(mysql_address):
                                'WITH "caching_sha2_password" '
                                'PASSWORD EXPIRE NEVER')
                 cursor.execute('FLUSH PRIVILEGES')
+        connection.close()
     except Exception:
         pytest.fail("Cannot initialize MySQL environment")
 

tests/sa/test_sa_compiled_cache.py

@@ -13,7 +13,9 @@
 
 
 @pytest.fixture()
-def make_engine(mysql_params, connection):
+def make_engine(connection, mysql_params, loop):
+    engines = []
+
     async def _make_engine(**kwargs):
         if "unix_socket" in mysql_params:
             conn_args = {"unix_socket": mysql_params["unix_socket"]}
@@ -23,14 +25,24 @@ async def _make_engine(**kwargs):
                 "port": mysql_params['port'],
             }
 
-        return (await sa.create_engine(db=mysql_params['db'],
-                                       user=mysql_params['user'],
-                                       password=mysql_params['password'],
-                                       minsize=10,
-                                       **conn_args,
-                                       **kwargs))
+        engine = await sa.create_engine(
+            db=mysql_params['db'],
+            user=mysql_params['user'],
+            password=mysql_params['password'],
+            minsize=10,
+            **conn_args,
+            **kwargs,
+        )
+
+        engines.append(engine)
+
+        return engine
+
+    yield _make_engine
 
-    return _make_engine
+    for engine in engines:
+        engine.terminate()
+        loop.run_until_complete(engine.wait_closed())
 
 
 async def start(engine):

tests/sa/test_sa_default.py

@@ -20,7 +20,9 @@
 
 
 @pytest.fixture()
-def make_engine(mysql_params, connection):
+def make_engine(connection, mysql_params, loop):
+    engines = []
+
     async def _make_engine(**kwargs):
         if "unix_socket" in mysql_params:
             conn_args = {"unix_socket": mysql_params["unix_socket"]}
@@ -30,14 +32,24 @@ async def _make_engine(**kwargs):
                 "port": mysql_params['port'],
             }
 
-        return (await sa.create_engine(db=mysql_params['db'],
-                                       user=mysql_params['user'],
-                                       password=mysql_params['password'],
-                                       minsize=10,
-                                       **conn_args,
-                                       **kwargs))
+        engine = await sa.create_engine(
+            db=mysql_params['db'],
+            user=mysql_params['user'],
+            password=mysql_params['password'],
+            minsize=10,
+            **conn_args,
+            **kwargs,
+        )
+
+        engines.append(engine)
+
+        return engine
+
+    yield _make_engine
 
-    return _make_engine
+    for engine in engines:
+        engine.terminate()
+        loop.run_until_complete(engine.wait_closed())
 
 
 async def start(engine):

tests/sa/test_sa_engine.py

@@ -13,7 +13,9 @@
 
 
 @pytest.fixture()
-def make_engine(connection, mysql_params):
+def make_engine(connection, mysql_params, loop):
+    engines = []
+
     async def _make_engine(**kwargs):
         if "unix_socket" in mysql_params:
             conn_args = {"unix_socket": mysql_params["unix_socket"]}
@@ -23,13 +25,24 @@ async def _make_engine(**kwargs):
                 "port": mysql_params['port'],
             }
 
-        return (await sa.create_engine(db=mysql_params['db'],
-                                       user=mysql_params['user'],
-                                       password=mysql_params['password'],
-                                       minsize=10,
-                                       **conn_args,
-                                       **kwargs))
-    return _make_engine
+        engine = await sa.create_engine(
+            db=mysql_params['db'],
+            user=mysql_params['user'],
+            password=mysql_params['password'],
+            minsize=10,
+            **conn_args,
+            **kwargs,
+        )
+
+        engines.append(engine)
+
+        return engine
+
+    yield _make_engine
+
+    for engine in engines:
+        engine.terminate()
+        loop.run_until_complete(engine.wait_closed())
 
 
 async def start(engine):