test: fix async test

alumni · alumni · commit 661a3a16e1fc · 2025-06-14T13:34:16.000+02:00
diff --git a/.github/workflows/database-tests.yml b/.github/workflows/database-tests.yml
@@ -107,7 +107,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7.37
+        image: mysql:8.0.42
         ports:
           - "3306:3306"
         env:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   # mysql
   mysql:
-    image: "mysql:5.7.37"
+    image: "mysql:8.0.42"
     container_name: "typeorm-mysql"
     ports:
       - "3306:3306"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
     "test": "npm run compile && npm run test:fast --",
     "test:ci": "mocha --bail",
     "test:fast": "mocha",
+    "typecheck": "tsc --noEmit",
     "watch": "tsc --watch"
   },
   "dependencies": {
@@ -141,7 +142,6 @@
     "mocha": "^10.8.2",
     "mongodb": "^6.15.0",
     "mssql": "^11.0.1",
-    "mysql": "^2.18.1",
     "mysql2": "^3.14.0",
     "nyc": "^17.1.0",
     "oracledb": "^6.8.0",
diff --git a/test/functional/driver/mysql/connection-options/enable-query-timeout.ts b/test/functional/driver/mysql/connection-options/enable-query-timeout.ts
@@ -16,8 +16,8 @@ describe("driver > mysql > connection options > enableQueryTimeout", () => {
         dropSchema: true,
         enabledDrivers: ["mysql"],
     }
-    const timeoutMs = 500
-    const longQueryTimeSec = 1
+    const timeoutMs = 10
+    const longQueryTimeSec = 0.02
     const shortQueryTimeSec = 0.005
 
     describe("when enableQueryTimeout is true", () => {
@@ -34,8 +34,8 @@ describe("driver > mysql > connection options > enableQueryTimeout", () => {
         beforeEach(() => reloadTestingDatabases(dataSources))
         after(() => closeTestingConnections(dataSources))
 
-        it("should throw a query execution timeout error for the query when it exceeds the maxQueryExecutionTime", async () => {
-            await Promise.all(
+        it("should throw a query execution timeout error for the query when it exceeds the maxQueryExecutionTime", () =>
+            Promise.all(
                 dataSources.map(async (dataSource) => {
                     await expect(
                         dataSource.manager
@@ -51,19 +51,17 @@ describe("driver > mysql > connection options > enableQueryTimeout", () => {
                         )
                     })
                 }),
-            )
-        })
+            ))
 
-        it("should not throw a query execution timeout error for the query when it runs within the maxQueryExecutionTime", async () => {
-            await Promise.all(
+        it("should not throw a query execution timeout error for the query when it runs within the maxQueryExecutionTime", async () =>
+            Promise.all(
                 dataSources.map(async (dataSource) => {
                     await expect(
                         dataSource.manager
                             .sql`SELECT SLEEP(${shortQueryTimeSec})`,
                     ).to.be.eventually.fulfilled
                 }),
-            )
-        })
+            ))
     })
 
     describe("when enableQueryTimeout is not provided", () => {
@@ -78,15 +76,14 @@ describe("driver > mysql > connection options > enableQueryTimeout", () => {
 
         after(() => closeTestingConnections(datasources))
 
-        it("should not throw a query execution timeout error", () => {
+        it("should not throw a query execution timeout error", () =>
             Promise.all(
                 datasources.map(async (dataSource) => {
                     await expect(
                         dataSource.manager
                             .sql`SELECT SLEEP(${longQueryTimeSec})`,
                     ).to.eventually.be.fulfilled
                 }),
-            )
-        })
+            ))
     })
 })
