Merge pull request #14100 from mheon/incremental_backports

[v4.1] Incremental backports

1 files changed, 7 insertions, 8 deletions

diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go
index 42b477da0..da9b511e0 100644
--- a/test/e2e/container_clone_test.go
+++ b/test/e2e/container_clone_test.go
@@ -24,7 +24,6 @@ var _ = Describe("Podman container clone", func() {
 		}
 		podmanTest = PodmanTestCreate(tempdir)
 		podmanTest.Setup()
-		podmanTest.SeedImages()
 	})
 
 	AfterEach(func() {
@@ -68,8 +67,8 @@ var _ = Describe("Podman container clone", func() {
 		ctrInspect := podmanTest.Podman([]string{"inspect", clone.OutputToString()})
 		ctrInspect.WaitWithDefaultTimeout()
 		Expect(ctrInspect).To(Exit(0))
-		Expect(ctrInspect.InspectContainerToJSON()[0].ImageName).To(Equal(fedoraMinimal))
-		Expect(ctrInspect.InspectContainerToJSON()[0].Name).To(Equal("new_name"))
+		Expect(ctrInspect.InspectContainerToJSON()[0]).To(HaveField("ImageName", fedoraMinimal))
+		Expect(ctrInspect.InspectContainerToJSON()[0]).To(HaveField("Name", "new_name"))
 	})
 
 	It("podman container clone name test", func() {
@@ -84,7 +83,7 @@ var _ = Describe("Podman container clone", func() {
 		cloneInspect.WaitWithDefaultTimeout()
 		Expect(cloneInspect).To(Exit(0))
 		cloneData := cloneInspect.InspectContainerToJSON()
-		Expect(cloneData[0].Name).To(Equal("testing123"))
+		Expect(cloneData[0]).To(HaveField("Name", "testing123"))
 	})
 
 	It("podman container clone resource limits override", func() {
@@ -104,7 +103,7 @@ var _ = Describe("Podman container clone", func() {
 		cloneInspect.WaitWithDefaultTimeout()
 		Expect(cloneInspect).To(Exit(0))
 		cloneData := cloneInspect.InspectContainerToJSON()
-		Expect(createData[0].HostConfig.NanoCpus).To(Equal(cloneData[0].HostConfig.NanoCpus))
+		Expect(createData[0].HostConfig).To(HaveField("NanoCpus", cloneData[0].HostConfig.NanoCpus))
 
 		create = podmanTest.Podman([]string{"create", "--memory=5", ALPINE})
 		create.WaitWithDefaultTimeout()
@@ -122,7 +121,7 @@ var _ = Describe("Podman container clone", func() {
 		cloneInspect.WaitWithDefaultTimeout()
 		Expect(cloneInspect).To(Exit(0))
 		cloneData = cloneInspect.InspectContainerToJSON()
-		Expect(createData[0].HostConfig.MemorySwap).To(Equal(cloneData[0].HostConfig.MemorySwap))
+		Expect(createData[0].HostConfig).To(HaveField("MemorySwap", cloneData[0].HostConfig.MemorySwap))
 
 		create = podmanTest.Podman([]string{"create", "--cpus=5", ALPINE})
 		create.WaitWithDefaultTimeout()
@@ -145,7 +144,7 @@ var _ = Describe("Podman container clone", func() {
 		Expect(cloneInspect).To(Exit(0))
 		cloneData = cloneInspect.InspectContainerToJSON()
 		Expect(createData[0].HostConfig.NanoCpus).ToNot(Equal(cloneData[0].HostConfig.NanoCpus))
-		Expect(cloneData[0].HostConfig.NanoCpus).To(Equal(nanoCPUs))
+		Expect(cloneData[0].HostConfig).To(HaveField("NanoCpus", nanoCPUs))
 
 		create = podmanTest.Podman([]string{"create", ALPINE})
 		create.WaitWithDefaultTimeout()
@@ -158,7 +157,7 @@ var _ = Describe("Podman container clone", func() {
 		cloneInspect.WaitWithDefaultTimeout()
 		Expect(cloneInspect).To(Exit(0))
 		cloneData = cloneInspect.InspectContainerToJSON()
-		Expect(cloneData[0].HostConfig.MemorySwappiness).To(Equal(int64(0)))
+		Expect(cloneData[0].HostConfig).To(HaveField("MemorySwappiness", int64(0)))
 
 	})