summaryrefslogtreecommitdiff
path: root/test/utils
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2022-07-30 00:08:00 +0200
committerMiloslav Trmač <mitr@redhat.com>2022-07-30 17:24:31 +0200
commit5a5624f8189c0e4c529e4c00d6ed66397d1db5b4 (patch)
tree3fe80d7b54a44a87884ecf917f079ced75445fe0 /test/utils
parent7599fde73e383824196854174847094d148b72a0 (diff)
downloadpodman-5a5624f8189c0e4c529e4c00d6ed66397d1db5b4.tar.gz
podman-5a5624f8189c0e4c529e4c00d6ed66397d1db5b4.tar.bz2
podman-5a5624f8189c0e4c529e4c00d6ed66397d1db5b4.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')
-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 9c2a63c81..19b287ae1 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)