Skip to content

Commit d068ce5

Browse files
committed
[misc] updating test for 10.4 possible default cipher and mysql non availability of TLSv1.2
1 parent 01a9d9e commit d068ce5

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
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-connection.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ describe('connection', () => {
182182
});
183183

184184
it('connection error event', function(done) {
185+
if (!shareConn.info.isMariaDB() && !shareConn.info.hasMinVersion(5, 6, 0)) this.skip();
185186
base
186187
.createConnection()
187188
.then(conn => {

test/integration/test-ssl.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,17 @@ 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 (!shareConn.info.isMariaDB() || (isWin && !shareConn.info.hasMinVersion(10, 4, 2))) {
306+
this.skip();
307+
}
306308

307309
base
308310
.createConnection({
309311
ssl: {
310312
rejectUnauthorized: false,
311313
secureProtocol: 'TLSv1_2_method',
312314
ciphers:
313-
'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256'
315+
'DHE-RSA-AES256-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256'
314316
}
315317
})
316318
.then(conn => {

0 commit comments

Comments
 (0)