From 0d4fb6cf129fc09b831086685e805f1feed4b71d Mon Sep 17 00:00:00 2001 From: Pavel Tikhomirov Date: Thu, 28 Jul 2022 16:27:25 +0300 Subject: [PATCH] integration-cli: Make service process live forever - TestServiceLogsCompleteness runs service with command to write 6 log lines but as command exits immediately, service is restarted and 6 more lines are printed in logs, which confuses the checker.Equals(6) check. - TestServiceLogsSince runs service with command to write 3 log lines, and service restart can also affect it's checks. Let's change from `tail` which exits immediately to `tail -f` which hangs forever, this way we would not confuse checks with more log lines when expected. Signed-off-by: Pavel Tikhomirov (cherry picked from commit f4c0ec8ffc427daa0a560695eb77e0428202ef14) --- integration-cli/docker_cli_service_logs_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go index 09ad4edf17..34f472a42a 100644 --- a/integration-cli/docker_cli_service_logs_test.go +++ b/integration-cli/docker_cli_service_logs_test.go @@ -75,7 +75,7 @@ func (s *DockerSwarmSuite) TestServiceLogsCompleteness(c *testing.T) { name := "TestServiceLogsCompleteness" // make a service that prints 6 lines - out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for line in $(seq 0 5); do echo log test $line; done; exec tail /dev/null") + out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for line in $(seq 0 5); do echo log test $line; done; exec tail -f /dev/null") assert.NilError(c, err) assert.Assert(c, strings.TrimSpace(out) != "") @@ -126,7 +126,7 @@ func (s *DockerSwarmSuite) TestServiceLogsSince(c *testing.T) { name := "TestServiceLogsSince" - out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for i in $(seq 1 3); do usleep 100000; echo log$i; done; exec tail /dev/null") + out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for i in $(seq 1 3); do usleep 100000; echo log$i; done; exec tail -f /dev/null") assert.NilError(c, err) assert.Assert(c, strings.TrimSpace(out) != "") poll.WaitOn(c, pollCheck(c, d.CheckActiveContainerCount, checker.Equals(1)), poll.WithTimeout(defaultReconciliationTimeout))