Skip to content

MLE-24763 Enabling logging test and removing winston #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2025
Merged

MLE-24763 Enabling logging test and removing winston #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def runTests() {
cd ..
rm -rf $WORKSPACE/*.xml || true
./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true
./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml || true
./node_modules/.bin/gulp setupProxyTests || true
./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true
./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml || true
'''
junit '**/*.xml'
}
Expand All @@ -33,8 +33,8 @@ def runDockerCompose(String markLogicDockerImage) {
cd node-client-api
echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''"
MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build
echo "Waiting 60s for MarkLogic to be ready to accept connections"
sleep 60s;
echo "Waiting 90s for MarkLogic to be ready to accept connections"
sleep 90s;
'''
}

Expand Down Expand Up @@ -129,8 +129,7 @@ pipeline {
runAuditReport()
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
runTests()
// Commenting this out temporarily for faster PR feedback.
// runE2ETests()
runE2ETests()
}
post {
always {
Expand Down
208 changes: 1 addition & 207 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"doc": "gulp doc",
"preinstall": "node checkNodeVersion",
"prestart": "node checkNodeVersion",
"pretest": "node checkNodeVersion",
"test:setup": "node etc/test-setup.js",
"test:teardown": "node etc/test-teardown.js",
"test": "gulp test"
Expand Down Expand Up @@ -65,8 +66,7 @@
"read": "^1.0.7",
"sanitize-html": "^2.13.0",
"should": "^13.2.3",
"stream-to-array": "^2.3.0",
"winston": "^3.8.2"
"stream-to-array": "^2.3.0"
},
"optionalDependencies": {
"kerberos": "^2.0.1",
Expand All @@ -78,10 +78,8 @@
"chalk": "4.1.2",
"braces": "3.0.3",
"brace-expansion": "2.0.2",
"color": "5.0.0",
"color-convert": "3.1.0",
"color-name": "2.0.0",
"color-string": "2.1.0",
"cross-spawn": "7.0.6",
"debug": "4.3.6",
Copy link
Contributor

@anu3990 anu3990 Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were part of fix for npm supply chain attack.

"is-arrayish": "0.3.2",
Expand Down
Loading