summaryrefslogtreecommitdiff
path: root/test/utils/utils.go
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2022-07-30 00:08:00 +0200
committerMiloslav Trmač <mitr@redhat.com>2022-08-02 16:52:56 +0200
commit62cc871c6667268fca30708fd03f25ee66a6fc99 (patch)
treef6a5e44dc858b809804548adcd390ed23d1cb61e /test/utils/utils.go
parent52db7637378881479137136395d9d9ede58a3f8a (diff)
downloadpodman-62cc871c6667268fca30708fd03f25ee66a6fc99.tar.gz
podman-62cc871c6667268fca30708fd03f25ee66a6fc99.tar.bz2
podman-62cc871c6667268fca30708fd03f25ee66a6fc99.zip
Update the registry server we test against from 2.6 to 2.8
... primarily so that it can support OCI artifacts. 2.8 already seems to exist in the repo. This requires changing WaitContainerReady to also check stderr (ultimately because docker/distribution was updated to a more recent sirupsen/logrus, which logs by default to stderr instead of stdout). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'test/utils/utils.go')
-rw-r--r--test/utils/utils.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 72339014e..3e7ed1d55 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -225,7 +225,7 @@ func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, s
return false
}
- if strings.Contains(s.OutputToString(), expStr) {
+ if strings.Contains(s.OutputToString(), expStr) || strings.Contains(s.ErrorToString(), expStr) {
return true
}
time.Sleep(time.Duration(step) * time.Second)