From 5a5624f8189c0e4c529e4c00d6ed66397d1db5b4 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Sat, 30 Jul 2022 00:08:00 +0200 Subject: Update the registry server we test against from 2.6 to 2.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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č --- test/utils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/utils') 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) -- cgit v1.2.3-54-g00ecf