[misc] deno test CI correction

Author: rusher

.github/workflows/ci.yml

@@ -77,7 +77,6 @@ jobs:
           deno-version: ${{ matrix.deno }}
 
       - name: Install dependencies
-        if: ${{ !matrix.deno }}
         run: npm install
 
       - name: Run Tests node

test/integration/pool.test.js

@@ -309,7 +309,7 @@ describe.concurrent('Pool', () => {
 
     const seconds = Math.round((performance.now() - start) / 1000);
     // on windows, less accurate, such needs to have 11 too
-    assert.isTrue(seconds === 10 || seconds === 11);
+    assert.isTrue(seconds === 10 || seconds === 11, 'result was ' + seconds);
   }, 20000);
 
   test('pool escape', async ({ skip }) => {
@@ -1118,7 +1118,7 @@ describe.concurrent('Pool', () => {
               assert.equal(pool.activeConnections(), 10);
               assert.equal(pool.totalConnections(), 10);
               assert.equal(pool.idleConnections(), 0);
-              assert.isOk(pool.taskQueueSize() > 8000);
+              assert.isOk(pool.taskQueueSize() > 8000, 'err, current pool.taskQueueSize() is ' + pool.taskQueueSize());
             }, 200);
           } else {
             assert.equal(pool.activeConnections(), 10);
@@ -1511,7 +1511,7 @@ describe.concurrent('Pool', () => {
 
       setTimeout(someWriterStream.destroy.bind(someWriterStream), 2);
     });
-  }, 10000);
+  }, 20000);
 
   test("ensure pipe ending doesn't stall connection promise", async ({ skip }) => {
     if (isMaxscale(shareConn)) return skip();

test/integration/ssl.test.js

@@ -50,15 +50,13 @@ describe.concurrent('ssl', function () {
     let serverCaFile = Conf.baseConfig.ssl && Conf.baseConfig.ssl.ca ? null : getEnv('TEST_DB_SERVER_CERT');
     let clientKeyFileName = getEnv('TEST_DB_CLIENT_KEY');
     let clientCertFileName = getEnv('TEST_DB_CLIENT_CERT');
-    let clientKeystoreFileName = getEnv('TEST_DB_CLIENT_PKCS');
 
     if (!serverCaFile && (Conf.baseConfig.host === 'localhost' || Conf.baseConfig.host === 'mariadb.example.com')) {
       try {
         if (fs.existsSync('../../ssl')) {
-          serverCaFile = '../../ssl/server.crt';
+          serverCaFile = '../../ssl/ca_server.crt';
           clientKeyFileName = '../../ssl/client.key';
           clientCertFileName = '../../ssl/client.crt';
-          clientKeystoreFileName = '../../ssl/fullclient-keystore.p12';
         }
       } catch (err) {
         console.error(err);
@@ -68,7 +66,6 @@ describe.concurrent('ssl', function () {
     if (serverCaFile) ca = [fs.readFileSync(serverCaFile, 'utf8')];
     if (clientKeyFileName) clientKey = [fs.readFileSync(clientKeyFileName, 'utf8')];
     if (clientCertFileName) clientCert = [fs.readFileSync(clientCertFileName, 'utf8')];
-    if (clientKeystoreFileName) clientKeystore = [fs.readFileSync(clientKeystoreFileName)];
 
     await shareConn.query("DROP USER IF EXISTS 'sslTestUser'" + getHostSuffix());
     await shareConn.query("DROP USER IF EXISTS 'X509testUser'" + getHostSuffix());
@@ -349,7 +346,7 @@ describe.concurrent('ssl', function () {
       ssl: { rejectUnauthorized: false, secureProtocol: 'TLSv1_method' },
       port: sslPort
     });
-    checkProtocol(conn, 'TLSv1');
+    await checkProtocol(conn, 'TLSv1');
     await conn.end();
   });
 
@@ -370,7 +367,7 @@ describe.concurrent('ssl', function () {
       ssl: { rejectUnauthorized: false, secureProtocol: 'TLSv1_1_method' },
       port: sslPort
     });
-    checkProtocol(conn, 'TLSv1.1');
+    await checkProtocol(conn, 'TLSv1.1');
     await conn.end();
   });
 
@@ -396,7 +393,7 @@ describe.concurrent('ssl', function () {
       },
       port: sslPort
     });
-    checkProtocol(conn, 'TLSv1.1');
+    await checkProtocol(conn, 'TLSv1.1');
     await conn.end();
   });
 
@@ -467,7 +464,7 @@ describe.concurrent('ssl', function () {
       ssl: { rejectUnauthorized: false, secureProtocol: 'TLSv1_2_method' },
       port: sslPort
     });
-    checkProtocol(conn, 'TLSv1.2');
+    await checkProtocol(conn, 'TLSv1.2');
     await conn.end();
   });
 
@@ -493,7 +490,7 @@ describe.concurrent('ssl', function () {
       },
       port: sslPort
     });
-    checkProtocol(conn, 'TLSv1.2');
+    await checkProtocol(conn, 'TLSv1.2');
     await validConnection(conn);
     await conn.end();
   });
@@ -543,15 +540,18 @@ describe.concurrent('ssl', function () {
     if (Conf.baseConfig.host !== 'localhost') return skip();
 
     try {
-      await createConnection({ host: '127.0.0.1', ssl: { ca: ca } });
+      await createConnection({ ssl: { ca: ca } });
       throw new Error('Must have thrown an exception !');
     } catch (err) {
-      assert(
-        err.message.includes("Hostname/IP doesn't match certificate's altnames") ||
-          err.message.includes("Hostname/IP does not match certificate's altnames"),
-        'error was : ' + err.message
-      );
-      assert(err.message.includes("IP: 127.0.0.1 is not in the cert's list"), 'error was : ' + err.message);
+      if (isDeno()) {
+        assert(err.message.includes('write UNKNOWN'), 'error was : ' + err.message);
+      } else {
+        assert(
+          err.message.includes("Hostname/IP doesn't match certificate's altnames") ||
+            err.message.includes("Hostname/IP does not match certificate's altnames"),
+          'error was : ' + err.message
+        );
+      }
     }
   });
 
@@ -571,7 +571,7 @@ describe.concurrent('ssl', function () {
     } else if (!shareConn.info.hasMinVersion(5, 7, 28)) {
       expectedProtocol = 'TLSv1.1';
     }
-    checkProtocol(conn, expectedProtocol);
+    await checkProtocol(conn, expectedProtocol);
     await validConnection(conn);
     await conn.end();
   });
@@ -706,9 +706,12 @@ describe.concurrent('ssl', function () {
   }, 10000);
 });
 
-function checkProtocol(conn, protocol) {
-  const currentProtocol = isDeno() ? conn.__tests.getSocket().protocol : conn.__tests.getSocket().getProtocol();
-
+async function checkProtocol(conn, protocol) {
+  let currentProtocol = isDeno() ? conn.__tests.getSocket().protocol : conn.__tests.getSocket().getProtocol();
+  if (!currentProtocol) {
+    const res = await conn.query("SHOW STATUS LIKE 'Ssl_version'");
+    currentProtocol = res[0].Value;
+  }
   if (Array.isArray(protocol)) {
     for (let i = 0; i < protocol.length; i++) {
       if (currentProtocol === protocol[i]) return;