Skip to content

Commit 9314dab

Browse files
committed
MLE-24763 Enabling logging test and removing winston
Only using bunyan in logging.js, and that test seems very safe to run, so it's no longer excluded by Jenkinsfile. Removed the two "test-complete" logging tests that weren't actually doing anything. Removing winston allows for the "color" and "color-string" overrides to be removed as well as nothing else depends on them.
1 parent 305041d commit 9314dab

File tree

7 files changed

+97
-387
lines changed

7 files changed

+97
-387
lines changed

Jenkinsfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ def runTests() {
1616
1717
cd ..
1818
rm -rf $WORKSPACE/*.xml || true
19-
./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
19+
./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml || true
2020
./node_modules/.bin/gulp setupProxyTests || true
21-
./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
21+
./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
2222
'''
2323
junit '**/*.xml'
2424
}
@@ -33,8 +33,8 @@ def runDockerCompose(String markLogicDockerImage) {
3333
cd node-client-api
3434
echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''"
3535
MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build
36-
echo "Waiting 60s for MarkLogic to be ready to accept connections"
37-
sleep 60s;
36+
echo "Waiting 90s for MarkLogic to be ready to accept connections"
37+
sleep 90s;
3838
'''
3939
}
4040

@@ -129,8 +129,7 @@ pipeline {
129129
runAuditReport()
130130
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
131131
runTests()
132-
// Commenting this out temporarily for faster PR feedback.
133-
// runE2ETests()
132+
runE2ETests()
134133
}
135134
post {
136135
always {

package-lock.json

Lines changed: 1 addition & 207 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"doc": "gulp doc",
1111
"preinstall": "node checkNodeVersion",
1212
"prestart": "node checkNodeVersion",
13+
"pretest": "node checkNodeVersion",
1314
"test:setup": "node etc/test-setup.js",
1415
"test:teardown": "node etc/test-teardown.js",
1516
"test": "gulp test"
@@ -65,8 +66,7 @@
6566
"read": "^1.0.7",
6667
"sanitize-html": "^2.13.0",
6768
"should": "^13.2.3",
68-
"stream-to-array": "^2.3.0",
69-
"winston": "^3.8.2"
69+
"stream-to-array": "^2.3.0"
7070
},
7171
"optionalDependencies": {
7272
"kerberos": "^2.0.1",
@@ -78,10 +78,8 @@
7878
"chalk": "4.1.2",
7979
"braces": "3.0.3",
8080
"brace-expansion": "2.0.2",
81-
"color": "5.0.0",
8281
"color-convert": "3.1.0",
8382
"color-name": "2.0.0",
84-
"color-string": "2.1.0",
8583
"cross-spawn": "7.0.6",
8684
"debug": "4.3.6",
8785
"is-arrayish": "0.3.2",

0 commit comments

Comments
 (0)