From ab9c726fc4bb37320bd210b3ceff446285a8bb45 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 21 Oct 2019 16:02:39 +0200 Subject: [PATCH] integration-cli: TestContainersAPICreateMountsValidation: use subtests Before: --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation (0.52s) docker_api_containers_test.go:1927: case 0 docker_api_containers_test.go:1927: case 1 docker_api_containers_test.go:1927: case 2 docker_api_containers_test.go:1927: case 3 docker_api_containers_test.go:1927: case 4 docker_api_containers_test.go:1927: case 5 docker_api_containers_test.go:1927: case 6 docker_api_containers_test.go:1927: case 7 docker_api_containers_test.go:1927: case 8 docker_api_containers_test.go:1927: case 9 docker_api_containers_test.go:1927: case 10 docker_api_containers_test.go:1927: case 11 docker_api_containers_test.go:1927: case 12 docker_api_containers_test.go:1927: case 13 docker_api_containers_test.go:1927: case 14 docker_api_containers_test.go:1927: case 15 After: --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation (1.13s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_0 (0.01s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_1 (0.00s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_2 (0.00s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_3 (0.00s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_4 (0.00s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_5 (0.11s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_6 (0.12s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_7 (0.13s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_8 (0.00s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_9 (0.06s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_10 (0.08s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_11 (0.10s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_12 (0.18s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_13 (0.12s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_14 (0.14s) --- PASS: TestDockerSuite/TestContainersAPICreateMountsValidation/case_15 (0.00s) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_api_containers_test.go | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index 1d5b5e7af2..34edd47588 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -1918,19 +1918,21 @@ func (s *DockerSuite) TestContainersAPICreateMountsValidation(c *testing.T) { }...) } - cli, err := client.NewClientWithOpts(client.FromEnv) + apiClient, err := client.NewClientWithOpts(client.FromEnv) assert.NilError(c, err) - defer cli.Close() + defer apiClient.Close() // TODO add checks for statuscode returned by API for i, x := range cases { - c.Logf("case %d", i) - _, err = cli.ContainerCreate(context.Background(), &x.config, &x.hostConfig, &networktypes.NetworkingConfig{}, "") - if len(x.msg) > 0 { - assert.ErrorContains(c, err, x.msg, "%v", cases[i].config) - } else { - assert.NilError(c, err) - } + x := x + c.Run(fmt.Sprintf("case %d", i), func(c *testing.T) { + _, err = apiClient.ContainerCreate(context.Background(), &x.config, &x.hostConfig, &networktypes.NetworkingConfig{}, "") + if len(x.msg) > 0 { + assert.ErrorContains(c, err, x.msg, "%v", cases[i].config) + } else { + assert.NilError(c, err) + } + }) } }