GitList

Browse code

integration-cli: make TestServiceLogs less noisy

Before:

make TEST_FILTER=TestServiceLogs test-integration
...
--- PASS: TestDockerSwarmSuite/TestServiceLogs (14.63s)
docker_cli_service_logs_test.go:49: log for "TestServiceLogs1": "TestServiceLogs1.1.rjyqj1v08llu@625d614f901a | hello1\n"
docker_cli_service_logs_test.go:49: log for "TestServiceLogs2": "TestServiceLogs2.1.fyaljkh9tmp3@625d614f901a | hello2\n"

After:

make TEST_FILTER=TestServiceLogs test-integration
...
--- PASS: TestDockerSwarmSuite/TestServiceLogs (14.63s)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/21 22:49:55
Showing 1 changed files

integration-cli/docker_cli_service_logs_test.go index 9170878..5ee8806 100644

integration-cli/docker_cli_service_logs_test.go

History View file @ 69c4a4f

@@ -46,8 +46,7 @@ func (s *DockerSwarmSuite) TestServiceLogs(c *testing.T) {
 	for name, message := range services {
 		out, err := d.Cmd("service", "logs", name)
 		assert.NilError(c, err)
-		c.Logf("log for %q: %q", name, out)
-		assert.Assert(c, strings.Contains(out, message))
+		assert.Assert(c, strings.Contains(out, message), "log for %q: %q", name, out)
 	}
 }
 

...	...	@@ -46,8 +46,7 @@ func (s DockerSwarmSuite) TestServiceLogs(c testing.T) {
46	46	for name, message := range services {
47	47	out, err := d.Cmd("service", "logs", name)
48	48	assert.NilError(c, err)
49		- c.Logf("log for %q: %q", name, out)
50		- assert.Assert(c, strings.Contains(out, message))
	49	+ assert.Assert(c, strings.Contains(out, message), "log for %q: %q", name, out)
51	50	}
52	51	}
53	52