From 1cdebb1dd0e4ca965fe77ba5442ef83bc6009d84 Mon Sep 17 00:00:00 2001 From: Steve Biondi Date: Mon, 15 Sep 2025 14:48:50 -0700 Subject: [PATCH] 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). --- test-app/docker-compose-nightlies.yaml | 2 +- test-app/docker-compose.yaml | 2 +- test-basic/client.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test-app/docker-compose-nightlies.yaml b/test-app/docker-compose-nightlies.yaml index e9a70161..161a0fde 100644 --- a/test-app/docker-compose-nightlies.yaml +++ b/test-app/docker-compose-nightlies.yaml @@ -22,6 +22,6 @@ services: volumes: - ./containerLogs:/var/opt/MarkLogic/Logs ports: - - 8000-8016:8000-8016 + - 8000-8017:8000-8017 - 8024-8029:8024-8029 - 8079:8079 diff --git a/test-app/docker-compose.yaml b/test-app/docker-compose.yaml index af43e8c7..cd0181d0 100644 --- a/test-app/docker-compose.yaml +++ b/test-app/docker-compose.yaml @@ -15,4 +15,4 @@ services: - ./docker/marklogic/logs:/var/opt/MarkLogic/Logs ports: - 8000-8002:8000-8002 - - 8015-8016:8015-8016 + - 8015-8017:8015-8017 diff --git a/test-basic/client.js b/test-basic/client.js index 24236061..1edff42c 100644 --- a/test-basic/client.js +++ b/test-basic/client.js @@ -146,7 +146,8 @@ describe('database clients', function () { .result() .catch(error => { try{ - assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.')); + assert(error.message.toString().includes('You have attempted to access an HTTP server using HTTPS. Please check your configuration.') || + error.message.toString().includes('write EPROTO')); done(); } catch(err){ done(err);