Merge pull request kubernetes#88471 from claudiubelu/tests/fix-hybrid-network

k8s-ci-robot · web-flow · commit fd5f5cc28570 · 2020-02-25T18:32:50.000-08:00
tests: Fixes Hybrid cluster network test
diff --git a/test/e2e/windows/hybrid_network.go b/test/e2e/windows/hybrid_network.go
@@ -52,8 +52,10 @@ var _ = SIGDescribe("Hybrid cluster network", func() {
 		ginkgo.It("should have stable networking for Linux and Windows pods", func() {
 			ginkgo.By("creating linux and windows pods")
 			linuxPod := createTestPod(f, linuxBusyBoxImage, linuxOS)
+			linuxPod = f.PodClient().CreateSync(linuxPod)
 			windowsPod := createTestPod(f, windowsBusyBoximage, windowsOS)
 			windowsPod.Spec.Containers[0].Args = []string{"test-webserver"}
+			windowsPod = f.PodClient().CreateSync(windowsPod)
 
 			ginkgo.By("checking connectivity to 8.8.8.8 53 (google.com) from Linux")
 			assertConsistentConnectivity(f, linuxPod.ObjectMeta.Name, linuxOS, linuxCheck("8.8.8.8", 53))
@@ -130,5 +132,5 @@ func createTestPod(f *framework.Framework, image string, os string) *v1.Pod {
 			},
 		}
 	}
-	return f.PodClient().CreateSync(pod)
+	return pod
 }

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,10 @@ var _ = SIGDescribe("Hybrid cluster network", func() {`
`52`	`52`	`ginkgo.It("should have stable networking for Linux and Windows pods", func() {`
`53`	`53`	`ginkgo.By("creating linux and windows pods")`
`54`	`54`	`linuxPod := createTestPod(f, linuxBusyBoxImage, linuxOS)`
	`55`	`+ linuxPod = f.PodClient().CreateSync(linuxPod)`
`55`	`56`	`windowsPod := createTestPod(f, windowsBusyBoximage, windowsOS)`
`56`	`57`	`windowsPod.Spec.Containers[0].Args = []string{"test-webserver"}`
	`58`	`+ windowsPod = f.PodClient().CreateSync(windowsPod)`
`57`	`59`
`58`	`60`	`ginkgo.By("checking connectivity to 8.8.8.8 53 (google.com) from Linux")`
`59`	`61`	`assertConsistentConnectivity(f, linuxPod.ObjectMeta.Name, linuxOS, linuxCheck("8.8.8.8", 53))`
`@@ -130,5 +132,5 @@ func createTestPod(f framework.Framework, image string, os string) v1.Pod {`
`130`	`132`	`},`
`131`	`133`	`}`
`132`	`134`	`}`
`133`		`- return f.PodClient().CreateSync(pod)`
	`135`	`+ return pod`
`134`	`136`	`}`