Merge pull request #19127 from edsantiago/fix_toolbox_flake

e2e: fix two toolbox flakes
containers · Jul 5, 2023 · 9049979 · 9049979
2 parents 485de41 + 99f93d5
commit 9049979
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go
@@ -257,9 +257,9 @@ var _ = Describe("Toolbox-specific testing", func() {
 		var username string = "testuser"
 		var homeDir string = "/home/testuser"
 		var shell string = "/bin/bash"
-		var uid string = "2000"
+		var uid string = "1411"
 		var groupName string = "testgroup"
-		var gid string = "2000"
+		var gid string = "1422"
 
 		// The use of bad* in the name of variables does not imply the invocation
 		// of useradd should fail The user is supposed to be created successfully

diff --git a/test/utils/utils.go b/test/utils/utils.go
@@ -225,14 +225,14 @@ func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, s
 	s.WaitWithDefaultTimeout()
 
 	for {
+		if strings.Contains(s.OutputToString(), expStr) || strings.Contains(s.ErrorToString(), expStr) {
+			return true
+		}
+
 		if time.Since(startTime) >= time.Duration(timeout)*time.Second {
 			GinkgoWriter.Printf("Container %s is not ready in %ds", id, timeout)
 			return false
 		}
-
-		if strings.Contains(s.OutputToString(), expStr) || strings.Contains(s.ErrorToString(), expStr) {
-			return true
-		}
 		time.Sleep(time.Duration(step) * time.Second)
 		s = p.PodmanBase([]string{"logs", id}, false, true)
 		s.WaitWithDefaultTimeout()