github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86679 from oomichi/remove-invalid-dependency-27

Browse Source 
Use e2epod.WaitForPodNameRunningInNamespace directly
This commit is contained in:
Kubernetes Prow Robot
2020-03-20 15:58:44 -07:00
committed by GitHub
parent 332cab4f3b 2c8955fd4a
commit a26f50a52e
23 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/framework.go
View File

@@ -520,11 +520,6 @@ func (f *Framework) WaitForPodNotFound(podName string, timeout time.Duration) er
return e2epod.WaitForPodNotFoundInNamespace(f.ClientSet, podName, f.Namespace.Name, timeout)
}
// WaitForPodRunning waits for the pod to run in the namespace.
func (f *Framework) WaitForPodRunning(podName string) error {
return e2epod.WaitForPodNameRunningInNamespace(f.ClientSet, podName, f.Namespace.Name)
}
// WaitForPodReady waits for the pod to flip to ready in the namespace.
func (f *Framework) WaitForPodReady(podName string) error {
return e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, f.Namespace.Name, PodStartTimeout)

4
test/e2e/framework/network/utils.go
View File

@@ -565,7 +565,7 @@ func (config *NetworkingTestConfig) createTestPods() {
config.createPod(hostTestContainerPod)
}
framework.ExpectNoError(config.f.WaitForPodRunning(testContainerPod.Name))
framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(config.f.ClientSet, testContainerPod.Name, config.f.Namespace.Name))
var err error
config.TestContainerPod, err = config.getPodClient().Get(context.TODO(), testContainerPod.Name, metav1.GetOptions{})
@@ -574,7 +574,7 @@ func (config *NetworkingTestConfig) createTestPods() {
}
if config.HostNetwork {
framework.ExpectNoError(config.f.WaitForPodRunning(hostTestContainerPod.Name))
framework.ExpectNoError(e2epod.WaitForPodNameRunningInNamespace(config.f.ClientSet, hostTestContainerPod.Name, config.f.Namespace.Name))
config.HostTestContainerPod, err = config.getPodClient().Get(context.TODO(), hostTestContainerPod.Name, metav1.GetOptions{})
if err != nil {
framework.Failf("Failed to retrieve %s pod: %v", hostTestContainerPod.Name, err)