Browse code
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 <ptikhomirov@virtuozzo.com>
Pavel Tikhomirov authored on 2022/07/28 22:27:25Showing 1 changed files
| ... | ... |
@@ -75,7 +75,7 @@ func (s *DockerSwarmSuite) TestServiceLogsCompleteness(c *testing.T) {
|
| 75 | 75 |
name := "TestServiceLogsCompleteness" |
| 76 | 76 |
|
| 77 | 77 |
// make a service that prints 6 lines |
| 78 |
- 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")
|
|
| 78 |
+ 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")
|
|
| 79 | 79 |
assert.NilError(c, err) |
| 80 | 80 |
assert.Assert(c, strings.TrimSpace(out) != "") |
| 81 | 81 |
|
| ... | ... |
@@ -126,7 +126,7 @@ func (s *DockerSwarmSuite) TestServiceLogsSince(c *testing.T) {
|
| 126 | 126 |
|
| 127 | 127 |
name := "TestServiceLogsSince" |
| 128 | 128 |
|
| 129 |
- 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")
|
|
| 129 |
+ 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")
|
|
| 130 | 130 |
assert.NilError(c, err) |
| 131 | 131 |
assert.Assert(c, strings.TrimSpace(out) != "") |
| 132 | 132 |
poll.WaitOn(c, pollCheck(c, d.CheckActiveContainerCount, checker.Equals(1)), poll.WithTimeout(defaultReconciliationTimeout)) |