Skip to content

Commit ba42206

Browse files
W-A-Jamesnbbeeken
W-A-James
and
nbbeeken
authored
ci(NODE-6678): Re-enable Node latest testing (#4393)
Co-authored-by: Neal Beeken <neal.beeken@mongodb.com>
1 parent 2b1af5b commit ba42206

14 files changed

+105
-98
lines changed

‎.evergreen/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4468,7 +4468,6 @@ buildvariants:
44684468
- test-tls-support-5.0
44694469
- test-tls-support-4.4
44704470
- test-tls-support-4.2
4471-
disable: true
44724471
- name: windows-vsCurrent-large-gallium
44734472
display_name: Windows Node16
44744473
run_on: windows-vsCurrent-large

‎.evergreen/generate_evergreen_tasks.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,6 @@ for (const {
442442
run_on,
443443
expansions: { NODE_LTS_VERSION: 'latest' },
444444
tasks: tasks.map(({ name }) => name),
445-
// TODO(NODE-6641): Unskip the smoke tests
446-
disable: true
447445
};
448446
if (clientEncryption) {
449447
buildVariantData.expansions.CLIENT_ENCRYPTION = true;

‎.evergreen/run-azure-kms-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ export MONGODB_URI="mongodb://localhost:27017"
1818
export EXPECTED_AZUREKMS_OUTCOME=${EXPECTED_AZUREKMS_OUTCOME:-omitted}
1919
export TEST_CSFLE=true
2020

21-
npx mocha --config test/mocha_mongodb.json test/integration/client-side-encryption/client_side_encryption.prose.19.on_demand_azure.test.ts
21+
npx mocha --config test/mocha_mongodb.js test/integration/client-side-encryption/client_side_encryption.prose.19.on_demand_azure.test.ts

‎.evergreen/run-gcp-kms-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ export MONGODB_URI="mongodb://localhost:27017"
2020
export EXPECTED_GCPKMS_OUTCOME=${EXPECTED_GCPKMS_OUTCOME:-omitted}
2121
export TEST_CSFLE=true
2222

23-
npx mocha --config test/mocha_mongodb.json test/integration/client-side-encryption/client_side_encryption.prose.17.on_demand_gcp.test.ts
23+
npx mocha --config test/mocha_mongodb.js test/integration/client-side-encryption/client_side_encryption.prose.17.on_demand_gcp.test.ts

‎.evergreen/run-serverless-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ -z ${SERVERLESS_ATLAS_USER+omitted} ]; then echo "SERVERLESS_ATLAS_USER is
1717
if [ -z ${SERVERLESS_ATLAS_PASSWORD+omitted} ]; then echo "SERVERLESS_ATLAS_PASSWORD is unset" && exit 1; fi
1818

1919
npx mocha \
20-
--config test/mocha_mongodb.json \
20+
--config test/mocha_mongodb.js \
2121
test/integration/crud/crud.spec.test.ts \
2222
test/integration/crud/crud.prose.test.ts \
2323
test/integration/retryable-reads/retryable_reads.spec.test.ts \

‎.mocharc.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
7+
require: [
8+
'source-map-support/register',
9+
'ts-node/register',
10+
'test/tools/runner/chai_addons.ts',
11+
'test/tools/runner/ee_checker.ts'
12+
],
13+
extension: ['js', 'ts'],
14+
recursive: true,
15+
timeout: 60000,
16+
failZero: true,
17+
reporter: 'test/tools/reporter/mongodb_reporter.js',
18+
sort: true,
19+
color: true,
20+
'node-option': Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
21+
};

‎.mocharc.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -132,32 +132,32 @@
132132
"check:bench": "npm --prefix test/benchmarks/driver_bench start",
133133
"check:coverage": "nyc npm run test:all",
134134
"check:integration-coverage": "nyc npm run check:test",
135-
"check:lambda": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/handler.test.js",
136-
"check:lambda:aws": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/aws_handler.test.js",
135+
"check:lambda": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/handler.test.js",
136+
"check:lambda:aws": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/aws_handler.test.js",
137137
"check:lint": "npm run build:dts && npm run check:dts && npm run check:eslint && npm run check:tsd",
138138
"check:eslint": "npm run build:dts && ESLINT_USE_FLAT_CONFIG=false eslint -v && ESLINT_USE_FLAT_CONFIG=false eslint --max-warnings=0 --ext '.js,.ts' src test",
139139
"check:tsd": "tsd --version && tsd",
140140
"check:dependencies": "mocha test/action/dependency.test.ts",
141141
"check:dts": "node ./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
142-
"check:search-indexes": "nyc mocha --config test/mocha_mongodb.json test/manual/search-index-management.prose.test.ts",
143-
"check:test": "mocha --config test/mocha_mongodb.json test/integration",
142+
"check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
143+
"check:test": "mocha --config test/mocha_mongodb.js test/integration",
144144
"check:unit": "mocha test/unit",
145145
"check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
146-
"check:atlas": "mocha --config test/manual/mocharc.json test/manual/atlas_connectivity.test.ts",
147-
"check:resource-management": "mocha --config test/manual/mocharc.json test/manual/resource_management.test.ts",
148-
"check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.json test/atlas/drivers_atlas_testing.test.ts",
149-
"check:adl": "mocha --config test/mocha_mongodb.json test/manual/atlas-data-lake-testing",
150-
"check:aws": "nyc mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_aws.test.ts",
151-
"check:oidc-auth": "mocha --config test/mocha_mongodb.json test/integration/auth/auth.spec.test.ts",
152-
"check:oidc-test": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc.prose.test.ts",
153-
"check:oidc-azure": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
154-
"check:oidc-gcp": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
155-
"check:oidc-k8s": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
156-
"check:kerberos": "nyc mocha --config test/manual/mocharc.json test/manual/kerberos.test.ts",
157-
"check:tls": "mocha --config test/manual/mocharc.json test/manual/tls_support.test.ts",
158-
"check:ldap": "nyc mocha --config test/manual/mocharc.json test/manual/ldap.test.ts",
159-
"check:socks5": "mocha --config test/manual/mocharc.json test/manual/socks5.test.ts",
160-
"check:csfle": "mocha --config test/mocha_mongodb.json test/integration/client-side-encryption",
146+
"check:atlas": "mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
147+
"check:resource-management": "mocha --config test/manual/mocharc.js test/manual/resource_management.test.ts",
148+
"check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
149+
"check:adl": "mocha --config test/mocha_mongodb.js test/manual/atlas-data-lake-testing",
150+
"check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts",
151+
"check:oidc-auth": "mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",
152+
"check:oidc-test": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts",
153+
"check:oidc-azure": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
154+
"check:oidc-gcp": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
155+
"check:oidc-k8s": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
156+
"check:kerberos": "nyc mocha --config test/manual/mocharc.js test/manual/kerberos.test.ts",
157+
"check:tls": "mocha --config test/manual/mocharc.js test/manual/tls_support.test.ts",
158+
"check:ldap": "nyc mocha --config test/manual/mocharc.js test/manual/ldap.test.ts",
159+
"check:socks5": "mocha --config test/manual/mocharc.js test/manual/socks5.test.ts",
160+
"check:csfle": "mocha --config test/mocha_mongodb.js test/integration/client-side-encryption",
161161
"check:snappy": "mocha test/unit/assorted/snappy.test.js",
162162
"check:x509": "mocha test/manual/x509_auth.test.ts",
163163
"fix:eslint": "npm run check:eslint -- --fix",

‎test/manual/mocharc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
7+
require: ['ts-node/register', 'test/tools/runner/chai_addons.ts'],
8+
reporter: 'test/tools/reporter/mongodb_reporter.js',
9+
failZero: true,
10+
color: true,
11+
timeout: 10000,
12+
'node-option': Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
13+
};

‎test/manual/mocharc.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎test/mocha_lambda.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
7+
require: ['test/integration/node-specific/examples/setup.js'],
8+
extension: ['js'],
9+
ui: 'test/tools/runner/metadata_ui.js',
10+
recursive: true,
11+
timeout: 6000,
12+
failZero: true,
13+
reporter: 'test/tools/reporter/mongodb_reporter.js',
14+
sort: true,
15+
color: true,
16+
'node-option': Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
17+
};

‎test/mocha_lambda.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/mocha_mongodb.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
7+
require: [
8+
'source-map-support/register',
9+
'ts-node/register',
10+
'test/tools/runner/chai_addons.ts',
11+
'test/tools/runner/ee_checker.ts',
12+
'test/tools/runner/hooks/configuration.ts',
13+
'test/tools/runner/hooks/leak_checker.ts',
14+
'test/tools/runner/hooks/legacy_crud_shims.ts'
15+
],
16+
extension: ['js', 'ts'],
17+
ui: 'test/tools/runner/metadata_ui.js',
18+
recursive: true,
19+
timeout: 60000,
20+
failZero: true,
21+
reporter: 'test/tools/reporter/mongodb_reporter.js',
22+
sort: true,
23+
color: true,
24+
ignore: [
25+
'test/integration/node-specific/examples/handler.js',
26+
'test/integration/node-specific/examples/handler.test.js',
27+
'test/integration/node-specific/examples/aws_handler.js',
28+
'test/integration/node-specific/examples/aws_handler.test.js',
29+
'test/integration/node-specific/examples/setup.js'
30+
],
31+
'node-option': Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
32+
};

‎test/mocha_mongodb.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)