Skip to content

Commit d22da40

Browse files
W-A-JamesW-A-James
committed
unskip tests
1 parent 654069f commit d22da40

File tree

11 files changed

+2096
-1638
lines changed

11 files changed

+2096
-1638
lines changed

‎.evergreen/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5031,7 +5031,6 @@ buildvariants:
50315031
- test-tls-support-5.0
50325032
- test-tls-support-4.4
50335033
- test-tls-support-4.2
5034-
disable: true
50355034
- name: windows-vsCurrent-large-gallium
50365035
display_name: Windows Node16
50375036
run_on: windows-vsCurrent-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,6 @@ for (const {
437437
run_on,
438438
expansions: { NODE_LTS_VERSION: 'latest' },
439439
tasks: tasks.map(({ name }) => name),
440-
// TODO(NODE-6641): Unskip the smoke tests
441-
disable: true
442440
};
443441
if (clientEncryption) {
444442
buildVariantData.expansions.CLIENT_ENCRYPTION = true;

‎.mocharc.json‎ renamed to ‎.mocharc.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{
2-
"$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/mocharc.json",
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
37
"require": [
48
"source-map-support/register",
59
"ts-node/register",
@@ -15,5 +19,6 @@
1519
"failZero": true,
1620
"reporter": "test/tools/reporter/mongodb_reporter.js",
1721
"sort": true,
18-
"color": true
22+
"color": true,
23+
"node-option": Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
1924
}

‎package-lock.json‎

Lines changed: 2002 additions & 1558 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -131,33 +131,33 @@
131131
"check:bench": "node test/benchmarks/driverBench",
132132
"check:coverage": "nyc npm run test:all",
133133
"check:integration-coverage": "nyc npm run check:test",
134-
"check:lambda": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/handler.test.js",
135-
"check:lambda:aws": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/aws_handler.test.js",
134+
"check:lambda": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/handler.test.js",
135+
"check:lambda:aws": "mocha --config test/mocha_lambda.js test/integration/node-specific/examples/aws_handler.test.js",
136136
"check:lint": "npm run build:dts && npm run check:dts && npm run check:eslint && npm run check:tsd",
137137
"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",
138138
"check:tsd": "tsd --version && tsd",
139139
"check:dependencies": "mocha test/action/dependency.test.ts",
140140
"check:dts": "node ./node_modules/typescript/bin/tsc --noEmit mongodb.d.ts && tsd",
141-
"check:search-indexes": "nyc mocha --config test/mocha_mongodb.json test/manual/search-index-management.prose.test.ts",
142-
"check:test": "mocha --config test/mocha_mongodb.json test/integration",
141+
"check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
142+
"check:test": "mocha --config test/mocha_mongodb.js test/integration",
143143
"check:unit": "mocha test/unit",
144144
"check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
145-
"check:atlas": "mocha --config test/manual/mocharc.json test/manual/atlas_connectivity.test.ts",
146-
"check:resource-management": "mocha --config test/manual/mocharc.json test/manual/resource_management.test.ts",
147-
"check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.json test/atlas/drivers_atlas_testing.test.ts",
148-
"check:adl": "mocha --config test/mocha_mongodb.json test/manual/atlas-data-lake-testing",
149-
"check:aws": "nyc mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_aws.test.ts",
150-
"check:oidc-auth": "mocha --config test/mocha_mongodb.json test/integration/auth/auth.spec.test.ts",
151-
"check:oidc-test": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc.prose.test.ts",
152-
"check:oidc-azure": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
153-
"check:oidc-gcp": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
154-
"check:oidc-k8s": "mocha --config test/mocha_mongodb.json test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
155-
"check:ocsp": "mocha --config test/manual/mocharc.json test/manual/ocsp_support.test.js",
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.js",
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",
145+
"check:atlas": "mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
146+
"check:resource-management": "mocha --config test/manual/mocharc.js test/manual/resource_management.test.ts",
147+
"check:drivers-atlas-testing": "mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
148+
"check:adl": "mocha --config test/mocha_mongodb.js test/manual/atlas-data-lake-testing",
149+
"check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts",
150+
"check:oidc-auth": "mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",
151+
"check:oidc-test": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts",
152+
"check:oidc-azure": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_azure.prose.05.test.ts",
153+
"check:oidc-gcp": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts",
154+
"check:oidc-k8s": "mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts",
155+
"check:ocsp": "mocha --config test/manual/mocharc.js test/manual/ocsp_support.test.js",
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.js",
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
3+
const [major] = process.versions.node.split('.');
4+
5+
/** @type {import("mocha").MochaOptions} */
6+
module.exports = {
7+
$schema:
8+
'https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/mocharc.json',
9+
require: ['test/integration/node-specific/examples/setup.js'],
10+
extension: ['js'],
11+
ui: 'test/tools/runner/metadata_ui.js',
12+
recursive: true,
13+
timeout: 6000,
14+
failZero: true,
15+
reporter: 'test/tools/reporter/mongodb_reporter.js',
16+
sort: true,
17+
color: true,
18+
'node-option': Number(major) >= 23 ? ['no-experimental-strip-types'] : undefined
19+
};

‎test/mocha_lambda.json‎

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

‎test/mocha_mongodb.js‎

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

0 commit comments

Comments
 (0)