Skip to content

Commit c07cb19

Browse files
author
Vitaly Korolev
committed
fix tests
1 parent 5659ca2 commit c07cb19

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

‎test/docker-tests.robot

+9-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Uninitialized MarkLogic container
1010
Create container with -e MARKLOGIC_INIT=false
1111
Docker log should contain *MARKLOGIC_JOIN_CLUSTER is false or not defined, not joining cluster.*
1212
Docker log should contain *MARKLOGIC_INIT is set to false or not defined, not initializing.*
13-
Docker log should contain *Starting container with MarkLogic ${MARKLOGIC_VERSION} and Docker script version ${MARKLOGIC_DOCKER_VERSION} built from ${BUILD_BRANCH} branch.*
13+
Docker log should contain *Starting container with MarkLogic Server.*
14+
Docker log should contain *| server ver: ${MARKLOGIC_VERSION} | scripts ver: ${MARKLOGIC_DOCKER_VERSION} | image type: ${IMAGE_TYPE} | branch: ${BUILD_BRANCH} |*
1415
Verify response for unauthenticated request with 8000 *Forbidden*
1516
Verify response for unauthenticated request with 8001 *This server must now self-install the initial databases and application servers. Click OK to continue.*
1617
Verify response for unauthenticated request with 8002 *Forbidden*
@@ -23,7 +24,8 @@ Uninitialized MarkLogic container no parameters
2324
Create container with
2425
Docker log should contain *MARKLOGIC_JOIN_CLUSTER is false or not defined, not joining cluster.*
2526
Docker log should contain *MARKLOGIC_INIT is set to false or not defined, not initializing.*
26-
Docker log should contain *Starting container with MarkLogic ${MARKLOGIC_VERSION} and Docker script version ${MARKLOGIC_DOCKER_VERSION} built from ${BUILD_BRANCH} branch.*
27+
Docker log should contain *Starting container with MarkLogic Server.*
28+
Docker log should contain *| server ver: ${MARKLOGIC_VERSION} | scripts ver: ${MARKLOGIC_DOCKER_VERSION} | image type: ${IMAGE_TYPE} | branch: ${BUILD_BRANCH} |*
2729
Verify response for unauthenticated request with 8000 *Forbidden*
2830
Verify response for unauthenticated request with 8001 *This server must now self-install the initial databases and application servers. Click OK to continue.*
2931
Verify response for unauthenticated request with 8002 *Forbidden*
@@ -38,7 +40,8 @@ Initialized MarkLogic container
3840
... -e MARKLOGIC_ADMIN_PASSWORD=${DEFAULT ADMIN PASS}
3941
Docker log should contain *MARKLOGIC_JOIN_CLUSTER is false or not defined, not joining cluster.*
4042
Docker log should contain *MARKLOGIC_INIT is true, initializing the MarkLogic server.*
41-
Docker log should contain *Starting container with MarkLogic ${MARKLOGIC_VERSION} and Docker script version ${MARKLOGIC_DOCKER_VERSION} built from ${BUILD_BRANCH} branch.*
43+
Docker log should contain *Starting container with MarkLogic Server.*
44+
Docker log should contain *| server ver: ${MARKLOGIC_VERSION} | scripts ver: ${MARKLOGIC_DOCKER_VERSION} | image type: ${IMAGE_TYPE} | branch: ${BUILD_BRANCH} |*
4245
Verify response for unauthenticated request with 8000 *Unauthorized*
4346
Verify response for unauthenticated request with 8001 *Unauthorized*
4447
Verify response for unauthenticated request with 8002 *Unauthorized*
@@ -54,7 +57,8 @@ Upgrade MarkLogic container
5457
... -e MARKLOGIC_ADMIN_PASSWORD=${DEFAULT ADMIN PASS}
5558
Docker log should contain *MARKLOGIC_JOIN_CLUSTER is false or not defined, not joining cluster.*
5659
Docker log should contain *MARKLOGIC_INIT is true, initializing the MarkLogic server.*
57-
Docker log should contain *Starting container with MarkLogic ${MARKLOGIC_VERSION} and Docker script version ${MARKLOGIC_DOCKER_VERSION} built from ${BUILD_BRANCH} branch.*
60+
Docker log should contain *Starting container with MarkLogic Server.*
61+
Docker log should contain *| server ver: ${MARKLOGIC_VERSION} | scripts ver: ${MARKLOGIC_DOCKER_VERSION} | image type: ${IMAGE_TYPE} | branch: ${BUILD_BRANCH} |*
5862
Verify response for unauthenticated request with 8000 *Unauthorized*
5963
Verify response for unauthenticated request with 8001 *Unauthorized*
6064
Verify response for unauthenticated request with 8002 *Unauthorized*
@@ -76,7 +80,7 @@ Initialized MarkLogic container with admin password containing special character
7680
... -e MARKLOGIC_ADMIN_PASSWORD=${SPEC CHARS ADMIN PASS}
7781
Docker log should contain *MARKLOGIC_JOIN_CLUSTER is false or not defined, not joining cluster.*
7882
Docker log should contain *MARKLOGIC_INIT is true, initializing the MarkLogic server.*
79-
Docker log should contain *Starting container with MarkLogic ${MARKLOGIC_VERSION} and Docker script version ${MARKLOGIC_DOCKER_VERSION} built from ${BUILD_BRANCH} branch.*
83+
Docker log should contain *| server ver: ${MARKLOGIC_VERSION} | scripts ver: ${MARKLOGIC_DOCKER_VERSION} | image type: ${IMAGE_TYPE} | branch: ${BUILD_BRANCH} |*
8084
Verify response for unauthenticated request with 8000 *Unauthorized*
8185
Verify response for unauthenticated request with 8001 *Unauthorized*
8286
Verify response for unauthenticated request with 8002 *Unauthorized*

0 commit comments

Comments
 (0)