github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address comments: remove unused resourceVersion in e2e util wait loop; poll pods every 2 seconds

Browse Source
This commit is contained in:
Janet Kuo
2017-02-08 10:41:45 -08:00
parent 5a7929dc2d
commit 7c89359cc8
9 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/apparmor_test.go
View File

@@ -144,7 +144,7 @@ func runAppArmorTest(f *framework.Framework, shouldRun bool, profile string) v1.
if shouldRun {
// The pod needs to start before it stops, so wait for the longer start timeout.
framework.ExpectNoError(framework.WaitTimeoutForPodNoLongerRunningInNamespace(
f.ClientSet, pod.Name, f.Namespace.Name, "", framework.PodStartTimeout))
f.ClientSet, pod.Name, f.Namespace.Name, framework.PodStartTimeout))
} else {
// Pod should remain in the pending state. Wait for the Reason to be set to "AppArmor".
w, err := f.PodClient().Watch(metav1.SingleObject(metav1.ObjectMeta{Name: pod.Name}))