docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

improve TestServiceLogs for the goroutine issue #28915

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: f8a93d0c9d157dddc4e4d4d9c43a6fe7c7c0c242
Component: engine
This commit is contained in:
Akihiro Suda
2016-11-30 05:48:44 +00:00
parent b729d1ae5d
commit cc8d5c0801
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/engine/integration-cli/docker_cli_service_logs_experimental_test.go
View File

@@ -23,19 +23,29 @@ func (s *DockerSwarmSuite) TestServiceLogs(c *check.C) {
d := s.AddDaemon(c, true, true)
name := "TestServiceLogs"
// we have multiple services here for detecting the goroutine issue #28915
services := map[string]string{
"TestServiceLogs1": "hello1",
"TestServiceLogs2": "hello2",
}
out, err := d.Cmd("service", "create", "--name", name, "--restart-condition", "none", "busybox", "sh", "-c", "echo hello world")
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
for name, message := range services {
out, err := d.Cmd("service", "create", "--name", name, "busybox",
"sh", "-c", fmt.Sprintf("echo %s; tail -f /dev/null", message))
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
}
// make sure task has been deployed.
waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
waitAndAssert(c, defaultReconciliationTimeout,
d.checkActiveContainerCount, checker.Equals, len(services))
out, err = d.Cmd("service", "logs", name)
fmt.Println(out)
c.Assert(err, checker.IsNil)
c.Assert(out, checker.Contains, "hello world")
for name, message := range services {
out, err := d.Cmd("service", "logs", name)
c.Assert(err, checker.IsNil)
c.Logf("log for %q: %q", name, out)
c.Assert(out, checker.Contains, message)
}
}
func (s *DockerSwarmSuite) TestServiceLogsFollow(c *check.C) {