Skip to content

Commit 7b18069

Browse files
rusherrusher
committed
[misc] xpand and skysql testing removal
1 parent 16e108c commit 7b18069

35 files changed

+135
-354
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ jobs:
7474
LOCAL_DB: ${{ steps.setup-env.outputs.database-type }}
7575
DB_TYPE: ${{ matrix.db-type }}
7676
TEST_DB_SERVER_CERT: ${{ matrix.db-type == 'container' && './.github/workflows/certs/server.crt' || '' }}
77+
DB_VERSION: ${{ matrix.db-tag }}
78+
7779

7880
- name: Download Codecov uploader
7981
shell: bash

‎test/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module.exports.isMaxscale = function isMaxscale() {
4848
const maxscaleVersion = global.shareConn.info.maxscaleVersion;
4949
if (!maxscaleVersion) {
5050
// maxscale before 23.08
51-
return process.env.srv === 'maxscale';
51+
return process.env.DB_TYPE === 'maxscale';
5252
}
5353
}
5454
return true;

‎test/integration/datatype/test-datetime.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
const base = require('../../base');
77
const { assert } = require('chai');
88
const Conf = require('../../conf');
9+
const { isMaxscale } = require('../../base');
910

1011
describe('datetime', () => {
1112
const date = new Date('2001-12-31 00:00:00');
@@ -46,11 +47,7 @@ describe('datetime', () => {
4647
//using distant server, time might be different
4748
// if local socket not available, this means using distant / docker server that might have other default
4849
if (!process.env.LOCAL_SOCKET_AVAILABLE) this.skip();
49-
if (
50-
(Conf.baseConfig.host !== 'localhost' && Conf.baseConfig.host !== 'mariadb.example.com') ||
51-
process.env.srv === 'maxscale' ||
52-
process.env.srv === 'skysql-ha'
53-
)
50+
if ((Conf.baseConfig.host !== 'localhost' && Conf.baseConfig.host !== 'mariadb.example.com') || isMaxscale())
5451
this.skip();
5552

5653
let res = await shareConn.query('SELECT UNIX_TIMESTAMP(?) tt', [new Date('2000-01-01 UTC')]);

‎test/integration/test-additional-server-info.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
2-
// Copyright (c) 2015-2023 MariaDB Corporation Ab
2+
// Copyright (c) 2015-2025 MariaDB Corporation Ab
33

44
'use strict';
55

66
const base = require('../base.js');
77
const { assert } = require('chai');
8+
const { isMaxscale } = require('../base');
89

910
describe('server additional information API', () => {
1011
it('server version', async function () {
11-
if (
12-
process.env.srv === 'skysql' ||
13-
process.env.srv === 'skysql-ha' ||
14-
process.env.srv === 'maxscale' ||
15-
process.env.srv === 'build'
16-
)
17-
this.skip();
12+
if (isMaxscale()) this.skip();
1813

1914
const res = await shareConn.query('SELECT VERSION() a');
2015
assert.deepEqual(res, [{ a: shareConn.serverVersion() }]);
2116
});
2217

2318
it('server type', function () {
24-
if (!process.env.srv) this.skip();
25-
assert.equal(process.env.srv !== 'mysql', shareConn.info.isMariaDB());
19+
if (!process.env.DB_TYPE) this.skip();
20+
assert.equal(process.env.DB_TYPE !== 'mysql', shareConn.info.isMariaDB());
2621
});
2722
});

‎test/integration/test-batch-callback.js

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -918,11 +918,6 @@ describe('batch callback', function () {
918918
});
919919

920920
it('simple batch error message ', function (done) {
921-
if (process.env.srv === 'skysql-ha') {
922-
// due to https://jira.mariadb.org/browse/MXS-3196
923-
this.skip();
924-
return;
925-
}
926921
simpleBatchErrorMsg(useCompression, true, done);
927922
});
928923

@@ -968,11 +963,6 @@ describe('batch callback', function () {
968963
});
969964

970965
it('simple batch error message ', function (done) {
971-
if (process.env.srv === 'skysql-ha') {
972-
// due to https://jira.mariadb.org/browse/MXS-3196
973-
this.skip();
974-
return;
975-
}
976966
simpleBatchErrorMsg(useCompression, true, done);
977967
});
978968

@@ -1114,11 +1104,6 @@ describe('batch callback', function () {
11141104
});
11151105

11161106
it('simple batch error message ', function (done) {
1117-
if (process.env.srv === 'skysql-ha') {
1118-
// due to https://jira.mariadb.org/browse/MXS-3196
1119-
this.skip();
1120-
return;
1121-
}
11221107
simpleBatchErrorMsg(useCompression, false, done);
11231108
});
11241109

@@ -1152,11 +1137,6 @@ describe('batch callback', function () {
11521137
});
11531138

11541139
it('simple batch error message ', function (done) {
1155-
if (process.env.srv === 'skysql-ha') {
1156-
// due to https://jira.mariadb.org/browse/MXS-3196
1157-
this.skip();
1158-
return;
1159-
}
11601140
simpleBatchErrorMsg(useCompression, false, done);
11611141
});
11621142

@@ -1180,11 +1160,6 @@ describe('batch callback', function () {
11801160
});
11811161

11821162
it('simple batch error', function (done) {
1183-
if (process.env.srv === 'skysql-ha') {
1184-
// due to https://jira.mariadb.org/browse/MXS-3196
1185-
this.skip();
1186-
return;
1187-
}
11881163
simpleNamedPlaceHoldersErr(true, done);
11891164
});
11901165

@@ -1209,11 +1184,6 @@ describe('batch callback', function () {
12091184
});
12101185

12111186
it('simple batch error', function (done) {
1212-
if (process.env.srv === 'skysql-ha') {
1213-
// due to https://jira.mariadb.org/browse/MXS-3196
1214-
this.skip();
1215-
return;
1216-
}
12171187
simpleNamedPlaceHoldersErr(false, done);
12181188
});
12191189

‎test/integration/test-batch-geometry-type.js

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const base = require('../base.js');
77
const { assert } = require('chai');
88
const Conf = require('../conf');
99
const Capabilities = require('../../lib/const/capabilities');
10+
const { isMaxscale } = require('../base');
1011

1112
describe('batch geometry type', () => {
1213
let supportBulk;
@@ -427,9 +428,7 @@ describe('batch geometry type', () => {
427428
type: 'MultiPoint',
428429
coordinates: []
429430
}
430-
: shareConn.info.hasMinVersion(10, 5, 2) &&
431-
process.env.srv !== 'maxscale' &&
432-
process.env.srv !== 'skysql-ha'
431+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
433432
? { type: 'MultiPoint' }
434433
: null
435434
},
@@ -439,9 +438,7 @@ describe('batch geometry type', () => {
439438
type: 'MultiPoint',
440439
coordinates: []
441440
}
442-
: shareConn.info.hasMinVersion(10, 5, 2) &&
443-
process.env.srv !== 'maxscale' &&
444-
process.env.srv !== 'skysql-ha'
441+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
445442
? { type: 'MultiPoint' }
446443
: null
447444
}
@@ -556,9 +553,7 @@ describe('batch geometry type', () => {
556553
type: 'MultiLineString',
557554
coordinates: [[]]
558555
}
559-
: shareConn.info.hasMinVersion(10, 5, 2) &&
560-
process.env.srv !== 'maxscale' &&
561-
process.env.srv !== 'skysql-ha'
556+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
562557
? { type: 'MultiLineString' }
563558
: null
564559
},
@@ -568,9 +563,7 @@ describe('batch geometry type', () => {
568563
type: 'MultiLineString',
569564
coordinates: []
570565
}
571-
: shareConn.info.hasMinVersion(10, 5, 2) &&
572-
process.env.srv !== 'maxscale' &&
573-
process.env.srv !== 'skysql-ha'
566+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
574567
? { type: 'MultiLineString' }
575568
: null
576569
},
@@ -580,9 +573,7 @@ describe('batch geometry type', () => {
580573
type: 'MultiLineString',
581574
coordinates: []
582575
}
583-
: shareConn.info.hasMinVersion(10, 5, 2) &&
584-
process.env.srv !== 'maxscale' &&
585-
process.env.srv !== 'skysql-ha'
576+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
586577
? { type: 'MultiLineString' }
587578
: null
588579
}
@@ -784,9 +775,7 @@ describe('batch geometry type', () => {
784775
type: 'MultiPolygon',
785776
coordinates: [[[]]]
786777
}
787-
: shareConn.info.hasMinVersion(10, 5, 2) &&
788-
process.env.srv !== 'maxscale' &&
789-
process.env.srv !== 'skysql-ha'
778+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
790779
? { type: 'MultiPolygon' }
791780
: null
792781
},
@@ -796,9 +785,7 @@ describe('batch geometry type', () => {
796785
type: 'MultiPolygon',
797786
coordinates: [[]]
798787
}
799-
: shareConn.info.hasMinVersion(10, 5, 2) &&
800-
process.env.srv !== 'maxscale' &&
801-
process.env.srv !== 'skysql-ha'
788+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
802789
? { type: 'MultiPolygon' }
803790
: null
804791
},
@@ -808,9 +795,7 @@ describe('batch geometry type', () => {
808795
type: 'MultiPolygon',
809796
coordinates: []
810797
}
811-
: shareConn.info.hasMinVersion(10, 5, 2) &&
812-
process.env.srv !== 'maxscale' &&
813-
process.env.srv !== 'skysql-ha'
798+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
814799
? { type: 'MultiPolygon' }
815800
: null
816801
},
@@ -820,9 +805,7 @@ describe('batch geometry type', () => {
820805
type: 'MultiPolygon',
821806
coordinates: []
822807
}
823-
: shareConn.info.hasMinVersion(10, 5, 2) &&
824-
process.env.srv !== 'maxscale' &&
825-
process.env.srv !== 'skysql-ha'
808+
: shareConn.info.hasMinVersion(10, 5, 2) && !isMaxscale()
826809
? { type: 'MultiPolygon' }
827810
: null
828811
}

‎test/integration/test-batch.js

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const fs = require('fs');
1010
const os = require('os');
1111
const path = require('path');
1212
const Conf = require('../conf');
13+
const { isMaxscale } = require('../base');
1314
const str = base.utf8Collation() ? "abcdefghijkflmn'opqrtuvwx🤘💪" : 'abcdefghijkflmn\'opqrtuvwxyz"';
1415

1516
describe('batch', function () {
@@ -1193,7 +1194,6 @@ describe('batch', function () {
11931194
};
11941195

11951196
it('pool batch stack trace', async function () {
1196-
if (process.env.srv === 'skysql' || process.env.srv === 'skysql-ha') this.skip();
11971197
const conn = await base.createConnection({ trace: true });
11981198
try {
11991199
await conn.batch('WRONG COMMAND', [[1], [1]]);
@@ -1206,7 +1206,6 @@ describe('batch', function () {
12061206
});
12071207

12081208
it('pool batch wrong param stack trace', async function () {
1209-
if (process.env.srv === 'skysql' || process.env.srv === 'skysql-ha') this.skip();
12101209
const conn = await base.createConnection({ trace: true });
12111210
try {
12121211
await conn.query('CREATE TABLE IF NOT EXISTS test_batch(id int, id2 int)');
@@ -1396,11 +1395,6 @@ describe('batch', function () {
13961395
});
13971396

13981397
it('simple batch error message ', async function () {
1399-
if (process.env.srv === 'skysql-ha') {
1400-
// due to https://jira.mariadb.org/browse/MXS-3196
1401-
this.skip();
1402-
return;
1403-
}
14041398
this.timeout(30000);
14051399
await simpleBatchErrorMsg(useCompression, true);
14061400
});
@@ -1422,15 +1416,15 @@ describe('batch', function () {
14221416

14231417
it('16M+ batch with 16M max_allowed_packet', async function () {
14241418
// // skipping in maxscale due to a bug: https://jira.mariadb.org/browse/MXS-3588
1425-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql-ha') this.skip();
1419+
if (isMaxscale()) this.skip();
14261420
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
14271421
this.timeout(320000);
14281422
await bigBatchWith16mMaxAllowedPacket(useCompression, true);
14291423
});
14301424

14311425
it('16M+ batch with 16M max_allowed_packet big insert', async function () {
14321426
// // skipping in maxscale due to a bug: https://jira.mariadb.org/browse/MXS-3588
1433-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql-ha') this.skip();
1427+
if (isMaxscale()) this.skip();
14341428
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
14351429
this.timeout(320000);
14361430
await bigBatchWith16mMaxAllowedPacketBig(useCompression, true);
@@ -1446,11 +1440,7 @@ describe('batch', function () {
14461440
});
14471441

14481442
it('16M+ error batch', async function () {
1449-
if (process.env.srv === 'skysql' || process.env.srv === 'skysql-ha' || maxAllowedSize <= testSize) {
1450-
this.skip();
1451-
} else {
1452-
await bigBatchError(useCompression, true);
1453-
}
1443+
await bigBatchError(useCompression, true);
14541444
});
14551445

14561446
it('batch with streams', async function () {
@@ -1494,11 +1484,6 @@ describe('batch', function () {
14941484
});
14951485

14961486
it('simple batch error message ', async function () {
1497-
if (process.env.srv === 'skysql-ha') {
1498-
// due to https://jira.mariadb.org/browse/MXS-3196
1499-
this.skip();
1500-
return;
1501-
}
15021487
this.timeout(30000);
15031488
await simpleBatchErrorMsg(useCompression, true);
15041489
});
@@ -1517,7 +1502,7 @@ describe('batch', function () {
15171502

15181503
it('16M+ batch with 16M max_allowed_packet', async function () {
15191504
// skipping in maxscale due to a bug: https://jira.mariadb.org/browse/MXS-3588
1520-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql-ha') this.skip();
1505+
if (isMaxscale()) this.skip();
15211506
if (!RUN_LONG_TEST) this.skip();
15221507
if (maxAllowedSize <= testSize) this.skip();
15231508
this.timeout(180000);
@@ -1696,7 +1681,7 @@ describe('batch', function () {
16961681

16971682
it('16M+ batch with 16M max_allowed_packet', async function () {
16981683
// skipping in maxscale due to a bug: https://jira.mariadb.org/browse/MXS-3588
1699-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql-ha') this.skip();
1684+
if (isMaxscale()) this.skip();
17001685
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
17011686
this.timeout(320000);
17021687
await bigBatchWith16mMaxAllowedPacket(useCompression, false);
@@ -1799,7 +1784,7 @@ describe('batch', function () {
17991784

18001785
it('16M+ batch with 16M max_allowed_packet', async function () {
18011786
// skipping in maxscale due to a bug: https://jira.mariadb.org/browse/MXS-3588
1802-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql-ha') this.skip();
1787+
if (isMaxscale()) this.skip();
18031788
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
18041789
this.timeout(380000);
18051790
await bigBatchWith16mMaxAllowedPacket(useCompression, false);
@@ -1842,18 +1827,12 @@ describe('batch', function () {
18421827
});
18431828

18441829
it('simple batch error', async function () {
1845-
if (process.env.srv === 'skysql-ha') {
1846-
// due to https://jira.mariadb.org/browse/MXS-3196
1847-
this.skip();
1848-
return;
1849-
}
18501830
this.timeout(30000);
18511831
await simpleNamedPlaceHoldersErr(true);
18521832
});
18531833

18541834
it('16M+ batch', async function () {
1855-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql' || process.env.srv === 'skysql-ha')
1856-
this.skip();
1835+
if (isMaxscale()) this.skip();
18571836
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
18581837
this.timeout(320000);
18591838
await more16MNamedPlaceHolders(true);
@@ -1883,8 +1862,7 @@ describe('batch', function () {
18831862
});
18841863

18851864
it('16M+ batch', async function () {
1886-
if (process.env.srv === 'maxscale' || process.env.srv === 'skysql' || process.env.srv === 'skysql-ha')
1887-
this.skip();
1865+
if (isMaxscale()) this.skip();
18881866
if (!RUN_LONG_TEST || maxAllowedSize <= testSize) return this.skip();
18891867
this.timeout(320000);
18901868
await more16MNamedPlaceHolders(false);

0 commit comments

Comments
 (0)