Skip to content

Commit 9dd5ef3

Browse files
committed
[misc] adding 10.4 TLSv1.2 testing on windows
1 parent 72a9e21 commit 9dd5ef3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

test/integration/test-auth-plugin.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ describe('authentication plugin', () => {
196196
.then(() => {
197197
return base.createConnection({
198198
user: 'mysqltest1',
199-
password: '!Passw0rd3',
200-
debug: true
199+
password: '!Passw0rd3'
201200
});
202201
})
203202
.then(conn => {

test/integration/test-debug.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ describe('debug', () => {
4040
}, 1000);
4141
});
4242

43-
4443
after(done => {
4544
fs.unlink(smallFileName, done);
4645
});

test/integration/test-ssl.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,19 @@ describe('ssl', function() {
302302
//MariaDB server doesn't permit TLSv1.2 on windows
303303
//MySQL community version doesn't support TLSv1.2
304304
const isWin = process.platform === 'win32';
305-
if (isWin || !shareConn.info.isMariaDB()) this.skip();
305+
if (
306+
(shareConn.info.isMariaDB() && isWin && !shareConn.info.hasMinVersion(10, 4, 2)) ||
307+
(isWin && !shareConn.info.isMariaDB())
308+
)
309+
this.skip();
306310

307311
base
308312
.createConnection({
309313
ssl: {
310314
rejectUnauthorized: false,
311315
secureProtocol: 'TLSv1_2_method',
312316
ciphers:
313-
'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256'
317+
'DHE-RSA-AES256-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256'
314318
}
315319
})
316320
.then(conn => {

0 commit comments

Comments
 (0)