Switch all e2es to the ginkgo wrapper

This commit is contained in:
Kris
2017-05-09 15:39:35 -07:00
parent e1877e36f7
commit 2ab0320745
12 changed files with 25 additions and 18 deletions

View File

@@ -127,7 +127,7 @@ var _ = framework.KubeDescribe("PodPreset", func() {
framework.Failf("Failed to observe pod creation: %v", event)
}
case <-time.After(framework.PodStartTimeout):
Fail("Timeout while waiting for pod creation")
framework.Failf("Timeout while waiting for pod creation")
}
// We need to wait for the pod to be running, otherwise the deletion
@@ -233,7 +233,7 @@ var _ = framework.KubeDescribe("PodPreset", func() {
framework.Failf("Failed to observe pod creation: %v", event)
}
case <-time.After(framework.PodStartTimeout):
Fail("Timeout while waiting for pod creation")
framework.Failf("Timeout while waiting for pod creation")
}
// We need to wait for the pod to be running, otherwise the deletion