Skip to content

Commit 910b2b9

Browse files
stevebioanu3990
authored andcommitted
MLE-24312: map port 8017 via docker-compose. SSL service configured for port 8017. Add a second error message for test using SSL to confirm error when connecting to non-SSL REST service. Message probably changed for ML12 (not sure, but error message in test does not work).
1 parent 1fd65fc commit 910b2b9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

test-app/docker-compose-nightlies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ services:
2222
volumes:
2323
- ./containerLogs:/var/opt/MarkLogic/Logs
2424
ports:
25-
- 8000-8016:8000-8016
25+
- 8000-8017:8000-8017
2626
- 8024-8029:8024-8029
2727
- 8079:8079

test-app/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ services:
1515
- ./docker/marklogic/logs:/var/opt/MarkLogic/Logs
1616
ports:
1717
- 8000-8002:8000-8002
18-
- 8015-8016:8015-8016
18+
- 8015-8017:8015-8017

test-basic/client.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ describe('database clients', function () {
146146
.result()
147147
.catch(error => {
148148
try{
149-
assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.'));
149+
assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.') ||
150+
error.message.toString().includes('write EPROTO'));
150151
done();
151152
} catch(err){
152153
done(err);

0 commit comments

Comments
 (0)