From 64a66f6590b3632a4c8fd311b6958e61c192d393 Mon Sep 17 00:00:00 2001 From: Thomas-Apter Date: Mon, 17 Aug 2020 14:57:31 +0100 Subject: [PATCH 1/4] Reformatted testing.md and adding required step make build-devjmstest to Docker tests instructions --- docs/testing.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/testing.md b/docs/testing.md index 07bf3a0..f0e9e97 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -14,7 +14,13 @@ There are two main sets of tests: 2. Docker tests, which test a complete Docker image, using the Docker API ### Running the Docker tests -The Docker tests can be run locally on a machine with Docker. For example: +Before running Docker tests, the following command must be ran: + +``` +make build-devjmstest +``` + +The Docker tests can be run locally on a machine with Docker. For example: ``` make test-devserver @@ -25,6 +31,7 @@ You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` ``` MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.0-amd64 make test-advancedserver +``` You can pass parameters to `go test` with an environment variable. For example, to run the "TestGoldenPath" test, run the following command: From 12bcf8b2da0c9fc8316ba5b110a50e53b4119d98 Mon Sep 17 00:00:00 2001 From: Thomas-Apter Date: Mon, 17 Aug 2020 15:56:42 +0100 Subject: [PATCH 2/4] Changed 'ran' to 'run' --- docs/testing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/testing.md b/docs/testing.md index f0e9e97..ee25af4 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -14,7 +14,7 @@ There are two main sets of tests: 2. Docker tests, which test a complete Docker image, using the Docker API ### Running the Docker tests -Before running Docker tests, the following command must be ran: +Before running Docker tests, the following command must be run: ``` make build-devjmstest From b9dd2f5e79e903c677d0d8995bc4cc92c30368d3 Mon Sep 17 00:00:00 2001 From: Thomas-Apter Date: Tue, 18 Aug 2020 10:10:39 +0100 Subject: [PATCH 3/4] Create advancedserver make target, and update docs to use 'make advancedserver' --- Makefile | 3 +++ docs/testing.md | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5b7af54..b739214 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,9 @@ test-all: build-devjmstest test-devserver test-advancedserver .PHONY: devserver devserver: build-devserver build-devjmstest test-devserver +.PHONY: advancedserver +advancedserver: build-advancedserver test-advancedserver + # Build incubating components .PHONY: incubating incubating: build-explorer diff --git a/docs/testing.md b/docs/testing.md index ee25af4..bbe0d0a 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -14,12 +14,7 @@ There are two main sets of tests: 2. Docker tests, which test a complete Docker image, using the Docker API ### Running the Docker tests -Before running Docker tests, the following command must be run: - -``` -make build-devjmstest -``` - + The Docker tests can be run locally on a machine with Docker. For example: ``` From b84581c7eed747f5d5173518548a51234b1ab04d Mon Sep 17 00:00:00 2001 From: Thomas-Apter Date: Tue, 18 Aug 2020 10:13:08 +0100 Subject: [PATCH 4/4] Changed testming.md to use make advancedserver --- docs/testing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/testing.md b/docs/testing.md index bbe0d0a..55ded8a 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -18,8 +18,8 @@ There are two main sets of tests: The Docker tests can be run locally on a machine with Docker. For example: ``` -make test-devserver -make test-advancedserver +make devserver +make advancedserver ``` You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example: