github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Test changes due to client-go staging changes

Browse Source
This commit is contained in:
Clayton Coleman
2017-01-23 13:38:37 -05:00
parent da7b2b9c53
commit c60809aead
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/disruption.go
View File

@@ -136,7 +136,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
// Locate a running pod.
var pod v1.Pod
err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
podList, err := cs.Pods(ns).List(v1.ListOptions{})
podList, err := cs.Pods(ns).List(metav1.ListOptions{})
if err != nil {
return false, err
}
@@ -231,7 +231,7 @@ func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) {
func waitForPodsOrDie(cs *kubernetes.Clientset, ns string, n int) {
By("Waiting for all pods to be running")
err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
pods, err := cs.Core().Pods(ns).List(v1.ListOptions{LabelSelector: "foo=bar"})
pods, err := cs.Core().Pods(ns).List(metav1.ListOptions{LabelSelector: "foo=bar"})
if err != nil {
return false, err
}

4
test/e2e/generated_clientset.go
View File

@@ -323,7 +323,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
podCopy := stagingClientPod(name, value)
pod := &podCopy
By("verifying no pod exists before the test")
pods, err := podClient.List(clientv1.ListOptions{})
pods, err := podClient.List(metav1.ListOptions{})
if err != nil {
framework.Failf("Failed to query for pods: %v", err)
}
@@ -337,7 +337,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
By("verifying the pod is in kubernetes")
timeout := 1 * time.Minute
if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
pods, err = podClient.List(clientv1.ListOptions{})
pods, err = podClient.List(metav1.ListOptions{})
if err != nil {
return false, err
}