aboutsummaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-09-14 05:33:36 -0600
committerEd Santiago <santiago@redhat.com>2022-09-14 10:49:18 -0600
commitd4a62ff9324b57f620a4cb03c8dcdae3a6540cb0 (patch)
treebd51f66a8074b375294235a9484c0b3f289d5c35 /pkg/domain/infra
parent017d81ddd0e8d228aadb949175c0aae1e4b9d925 (diff)
downloadpodman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.tar.gz
podman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.tar.bz2
podman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.zip
System tests: fix three races
Three tests were running 'container rm' on 'start'ed containers that might not yet have exited. Fix. Also, tighten up the tests themselves, to make even more sure that they test what they're supposed to test. Discovered, in CI, that 'podman-remote logs --timestamps' was unimplemented. Thanks to @Luap99 for the fix to that. Fixes: #15783 Fixes: #15795 Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/tunnel/containers.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 324802a1f..572807ad6 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -517,7 +517,7 @@ func (ic *ContainerEngine) ContainerLogs(_ context.Context, nameOrIDs []string,
stdout := opts.StdoutWriter != nil
stderr := opts.StderrWriter != nil
options := new(containers.LogOptions).WithFollow(opts.Follow).WithSince(since).WithUntil(until).WithStderr(stderr)
- options.WithStdout(stdout).WithTail(tail)
+ options.WithStdout(stdout).WithTail(tail).WithTimestamps(opts.Timestamps)
var err error
stdoutCh := make(chan string)