Skip to content

Commit eb33d01

Browse files
committed
Use reporter across all packages
1 parent 2bfe4c8 commit eb33d01

File tree

27 files changed

+28
-31
lines changed

27 files changed

+28
-31
lines changed

.evergreen.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ functions:
197197
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_run_only_in_package}
198198
AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
199199
AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
200+
TASK_NAME: ${task_name}
200201
- command: s3.put
201202
params:
202203
aws_key: ${aws_key}
@@ -6621,7 +6622,7 @@ functions:
66216622
AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
66226623
AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
66236624
DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
6624-
E2E_TASK_NAME: ${task_name}
6625+
TASK_NAME: ${task_name}
66256626

66266627
###
66276628
# PACKAGING AND UPLOADING

.evergreen/evergreen.yml.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ functions:
267267
MONGOSH_RUN_ONLY_IN_PACKAGE: ${mongosh_run_only_in_package}
268268
AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
269269
AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
270+
TASK_NAME: ${task_name}
270271
- command: s3.put
271272
params:
272273
aws_key: ${aws_key}
@@ -520,7 +521,7 @@ functions:
520521
AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
521522
AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
522523
DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
523-
E2E_TASK_NAME: ${task_name}
524+
TASK_NAME: ${task_name}
524525

525526
###
526527
# PACKAGING AND UPLOADING

.evergreen/run-e2e-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22
set -e
33
export NODE_JS_VERSION=${NODE_JS_VERSION}
4-
export E2E_TASK_NAME=${E2E_TASK_NAME}
4+
export TASK_NAME=${TASK_NAME}
55

6-
if [[ "$DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL" == "true" ]] && [[ ! "$E2E_TASK_NAME" =~ openssl(3|11) ]]; then
6+
if [[ "$DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL" == "true" ]] && [[ ! "$TASK_NAME" =~ openssl(3|11) ]]; then
77
# On RHEL9 and based-distros, an additional configuration option
88
# `rh-allow-sha1-signatures` is present which is not recognizable to the
99
# OpenSSL version bundled with Node.js and hence the mongosh binary fails to

.evergreen/setup-env.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
77
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
88
export IS_MONGOSH_EVERGREEN_CI=1
99
export DEBUG="mongodb*,$DEBUG"
10-
export TASK_NAME=${E2E_TASK_NAME}
11-
12-
echo "Task name attempts"
13-
echo $TASK_NAME
14-
echo $E2E_TASK_NAME
1510

1611
if [ "$OS" != "Windows_NT" ]; then
1712
if which realpath; then # No realpath on macOS, but also not needed there
File renamed without changes.

packages/arg-parser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"unsafe-perm": true
1212
},
1313
"scripts": {
14-
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
14+
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"",
1515
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
1616
"test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
1717
"test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",

packages/async-rewriter2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"pretest": "npm run compile",
88
"benchmark": "node -r ts-node/register benchmark/index.ts",
9-
"test": "mocha --experimental-vm-modules -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
9+
"test": "mocha --experimental-vm-modules -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"",
1010
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
1111
"test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
1212
"test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",

packages/autocomplete/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"node": ">=14.15.1"
1818
},
1919
"scripts": {
20-
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
20+
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"",
2121
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
2222
"test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
2323
"test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",

packages/browser-runtime-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"url": "git://github.com/mongodb-js/mongosh.git"
1616
},
1717
"scripts": {
18-
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
18+
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"",
1919
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
2020
"test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
2121
"test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",

packages/browser-runtime-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"url": "git://github.com/mongodb-js/mongosh.git"
1616
},
1717
"scripts": {
18-
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
18+
"test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\" --reporter \"../../configs/mocha-config-mongosh/reporter.ts\"",
1919
"test-ci": "node ../../scripts/run-if-package-requested.js npm test",
2020
"test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
2121
"test-ci-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test-ci",

0 commit comments

Comments
 (0)