test: fix hanging integration tests

Author: karenc-bq

tests/integration/container/tests/mysql_pool.test.ts

@@ -109,6 +109,7 @@ describe("mysql pool integration tests", () => {
         expect(result[0][0].query_id).toBe(index + 1);
       });
       expect(connectionIds.size).toBeLessThanOrEqual(10);
+      await client.end();
     },
     1320000
   );
@@ -128,6 +129,7 @@ describe("mysql pool integration tests", () => {
       const currentConnectionId = await auroraTestUtility.queryInstanceId(client);
       expect(await auroraTestUtility.isDbInstanceWriter(currentConnectionId)).toBe(true);
       expect(currentConnectionId).not.toBe(initialWriterId);
+      await client.end();
     },
     1320000
   );
@@ -156,6 +158,8 @@ describe("mysql pool integration tests", () => {
       await expect(async () => {
         await poolClient.query("SELECT * FROM test_table WHERE id = 1");
       }).rejects.toThrow();
+
+      await client.end();
     },
     1320000
   );
@@ -192,6 +196,8 @@ describe("mysql pool integration tests", () => {
     const currentConnectionId = await auroraTestUtility.queryInstanceId(client);
     expect(await auroraTestUtility.isDbInstanceWriter(currentConnectionId)).toBe(true);
     expect(currentConnectionId).not.toBe(initialWriterId);
+
+    await client.end();
   });
 
   itIfMySQL(
@@ -237,6 +243,8 @@ describe("mysql pool integration tests", () => {
         await poolClient.query("COMMIT");
         await poolClient.release();
       }
+
+      await client.end();
     },
     1320000
   );
@@ -295,6 +303,8 @@ describe("mysql pool integration tests", () => {
         await poolClient.query("COMMIT");
         await poolClient.release();
       }
+
+      await client.end();
     },
     1320000
   );

tests/integration/container/tests/pg_pool.test.ts

@@ -67,6 +67,7 @@ afterEach(async () => {
   if (client !== null) {
     try {
       await client.end();
+      await PluginManager.releaseResources();
     } catch (error) {
       // pass
     }
@@ -92,6 +93,8 @@ describe("pg pool integration tests", () => {
     });
 
     expect(connectionIds.size).toBe(10);
+
+    await client.end();
   });
 
   itIfPG("sequential execution", async () => {
@@ -112,6 +115,8 @@ describe("pg pool integration tests", () => {
     });
 
     expect(connectionIds.size).toBeLessThanOrEqual(10);
+
+    await client.end();
   });
 
   itIfPG("failover writer during concurrent query execution", async () => {
@@ -131,6 +136,8 @@ describe("pg pool integration tests", () => {
     const currentConnectionId = await auroraTestUtility.queryInstanceId(client);
     expect(await auroraTestUtility.isDbInstanceWriter(currentConnectionId)).toBe(true);
     expect(currentConnectionId).not.toBe(initialWriterId);
+
+    await client.end();
   });
 
   itIfPG("failover writer during multi-statement transaction", async () => {
@@ -159,6 +166,7 @@ describe("pg pool integration tests", () => {
     await expect(async () => {
       await client.query("SELECT * FROM test_table WHERE id = 1");
     }).rejects.toThrow();
+    await client.end();
   });
 
   itIfPG(
@@ -195,8 +203,7 @@ describe("pg pool integration tests", () => {
       await poolClient1.query("COMMIT");
       await poolClient2.query("COMMIT");
 
-      poolClient1.release();
-      poolClient2.release();
+      await client.end();
     },
     1320000
   );
@@ -236,8 +243,7 @@ describe("pg pool integration tests", () => {
 
       await Promise.all([poolClient1.query("COMMIT"), poolClient2.query("COMMIT")]);
 
-      poolClient1.release();
-      poolClient2.release();
+      await client.end();
     },
     1320000
   );