Merge pull request #14112 from openshift-cherrypick-robot/cherry-pick-14085-to-v4.1

[v4.1] Add podman machine events

2 files changed, 34 insertions, 16 deletions

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index a61ef8640..28991af7f 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -1063,3 +1064,36 @@ func digShort(container, lookupName string, matchNames []string, p *PodmanTestIn
 	}
 	Fail("dns is not responding")
 }
+
+// WaitForFile to be created in defaultWaitTimeout seconds, returns false if file not created
+func WaitForFile(path string) (err error) {
+	until := time.Now().Add(time.Duration(defaultWaitTimeout) * time.Second)
+	for i := 1; time.Now().Before(until); i++ {
+		_, err = os.Stat(path)
+		switch {
+		case err == nil:
+			return nil
+		case errors.Is(err, os.ErrNotExist):
+			time.Sleep(time.Duration(i) * time.Second)
+		default:
+			return err
+		}
+	}
+	return err
+}
+
+// WaitForService blocks, waiting for some service listening on given host:port
+func WaitForService(address url.URL) {
+	// Wait for podman to be ready
+	var conn net.Conn
+	var err error
+	for i := 1; i <= 5; i++ {
+		conn, err = net.Dial("tcp", address.Host)
+		if err != nil {
+			// Podman not available yet...
+			time.Sleep(time.Duration(i) * time.Second)
+		}
+	}
+	Expect(err).ShouldNot(HaveOccurred())
+	conn.Close()
+}
diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go
index 2bc7756d6..4c16ea788 100644
--- a/test/e2e/system_service_test.go
+++ b/test/e2e/system_service_test.go
@@ -122,22 +122,6 @@ var _ = Describe("podman system service", func() {
 	})
 })
 
-// WaitForService blocks, waiting for some service listening on given host:port
-func WaitForService(address url.URL) {
-	// Wait for podman to be ready
-	var conn net.Conn
-	var err error
-	for i := 1; i <= 5; i++ {
-		conn, err = net.Dial("tcp", address.Host)
-		if err != nil {
-			// Podman not available yet...
-			time.Sleep(time.Duration(i) * time.Second)
-		}
-	}
-	Expect(err).ShouldNot(HaveOccurred())
-	conn.Close()
-}
-
 // randomPort leans on the go net library to find an available port...
 func randomPort() string {
 	port, err := utils.GetRandomPort()