test: configure fake timers for iam tests (#353)

aws · Dec 13, 2024 · d89ff9c · d89ff9c
1 parent 1bbb070
commit d89ff9c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/docs/using-the-nodejs-wrapper/using-plugins/UsingTheReadWriteSplittingPlugin.md b/docs/using-the-nodejs-wrapper/using-plugins/UsingTheReadWriteSplittingPlugin.md
@@ -103,9 +103,11 @@ props.set("connectionProvider", provider);
 
 4. Continue as normal: create connections and use them as needed.
 
-5. When you are finished using all connections, call `await provider.releaseResources()`.
+5. When you are finished using all connections, call `await PluginManager.releaseResources()`, and then `await provider.releaseResources()`.
 
 > [!IMPORTANT]
+> To ensure the provider can close the pools, call `await PluginManager.releaseResources()` first.
+>
 > You must call `await provider.releaseResources()` to close the internal connection pools when you are finished using all connections. Unless `await ConnectionProviderManager.releaseResources()` is called, the wrapper driver will keep the pools open so that they can be shared between connections.
 
 ### Reader Selection

diff --git a/examples/aws_driver_example/aws_interal_connection_pool_password_warning_postgres_example.ts b/examples/aws_driver_example/aws_interal_connection_pool_password_warning_postgres_example.ts
@@ -72,6 +72,7 @@ try {
 } finally {
   await newClient.end();
 }
+
 // Closes all pools and removes all cached pool connections.
 await provider.releaseResources();
 
@@ -90,8 +91,8 @@ try {
   await newClient2.connect();
   // Will not reach - exception will be thrown
 } finally {
+  // Clean up resources used by the plugins.
+  await PluginManager.releaseResources();
+
   logger.debug("example complete");
 }
-
-// Clean up resources used by the plugins.
-await PluginManager.releaseResources();
diff --git a/examples/aws_driver_example/aws_internal_connection_pool_password_warning_mysql_example.ts b/examples/aws_driver_example/aws_internal_connection_pool_password_warning_mysql_example.ts
@@ -72,6 +72,7 @@ try {
 } finally {
   await newClient.end();
 }
+
 // Closes all pools and removes all cached pool connections.
 await provider.releaseResources();
 
@@ -90,8 +91,8 @@ try {
   await newClient2.connect();
   // Will not reach - exception will be thrown.
 } finally {
+  // Clean up resources used by the plugins.
+  await PluginManager.releaseResources();
+
   logger.debug("example complete");
 }
-
-// Clean up resources used by the plugins.
-await PluginManager.releaseResources();
diff --git a/examples/aws_driver_example/aws_internal_connection_pooling_mysql_example.ts b/examples/aws_driver_example/aws_internal_connection_pooling_mysql_example.ts
@@ -108,6 +108,9 @@ try {
 } finally {
   await client.end();
 
+  // Clean up resources used by the plugins.
+  await PluginManager.releaseResources();
+
   // If configured to use internal connection pools, close them here.
   await provider.releaseResources();
 }
@@ -138,6 +141,3 @@ async function queryWithFailoverHandling(client: AwsMySQLClient, query: string)
     }
   }
 }
-
-// Clean up resources used by the plugins.
-await PluginManager.releaseResources();
diff --git a/examples/aws_driver_example/aws_internal_connection_pooling_postgres_example.ts b/examples/aws_driver_example/aws_internal_connection_pooling_postgres_example.ts
@@ -108,6 +108,9 @@ try {
 } finally {
   await client.end();
 
+  // Clean up resources used by the plugins.
+  await PluginManager.releaseResources();
+
   // If configured to use internal connection pools, close them here.
   await provider.releaseResources();
 }
@@ -138,6 +141,3 @@ async function queryWithFailoverHandling(client: AwsPGClient, query: string) {
     }
   }
 }
-
-// Clean up resources used by the plugins.
-await PluginManager.releaseResources();
diff --git a/tests/integration/container/tests/iam_authentication.test.ts b/tests/integration/container/tests/iam_authentication.test.ts
@@ -84,7 +84,9 @@ async function validateConnection(client: AwsPGClient | AwsMySQLClient) {
 describe("iam authentication", () => {
   beforeEach(async () => {
     logger.info(`Test started: ${expect.getState().currentTestName}`);
-    jest.useFakeTimers();
+    jest.useFakeTimers({
+      doNotFake: ["nextTick"]
+    });
     env = await TestEnvironment.getCurrent();
     driver = DriverHelper.getDriverForDatabaseEngine(env.engine);
     initClientFunc = DriverHelper.getClient(driver);
@@ -97,6 +99,11 @@ describe("iam authentication", () => {
     logger.info(`Test finished: ${expect.getState().currentTestName}`);
   }, 1320000);
 
+  afterAll(async () => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+  });
+
   itIf(
     "iam wrong database username",
     async () => {

diff --git a/tests/integration/container/tests/read_write_splitting.test.ts b/tests/integration/container/tests/read_write_splitting.test.ts
@@ -115,14 +115,14 @@ describe("aurora read write splitting", () => {
         // pass
       }
     }
+    await PluginManager.releaseResources();
     if (provider !== null) {
       try {
         await provider.releaseResources();
       } catch (error) {
         // pass
       }
     }
-    await PluginManager.releaseResources();
     logger.info(`Test finished: ${expect.getState().currentTestName}`);
   }, 1320000);