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

rewrite client-go import path in the main repository

Browse Source 
convert e2e tests of client-go to use version options
This commit is contained in:
Chao Xu
2016-10-17 15:09:42 -07:00
parent fb9bb501fb
commit 923757f3e0
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/disruption.go
View File

@@ -22,13 +22,12 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/client-go/1.5/kubernetes" "k8s.io/client-go/kubernetes"
apiapi "k8s.io/client-go/1.5/pkg/api" "k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/api/unversioned" api "k8s.io/client-go/pkg/api/v1"
api "k8s.io/client-go/1.5/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
extensions "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" policy "k8s.io/client-go/pkg/apis/policy/v1alpha1"
policy "k8s.io/client-go/1.5/pkg/apis/policy/v1alpha1" "k8s.io/client-go/pkg/util/intstr"
"k8s.io/client-go/1.5/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
@@ -132,7 +131,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
// Locate a running pod. // Locate a running pod.
var pod api.Pod var pod api.Pod
err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) { err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) {
podList, err := cs.Pods(ns).List(apiapi.ListOptions{}) podList, err := cs.Pods(ns).List(api.ListOptions{})
if err != nil { if err != nil {
return false, err return false, err
} }

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

@@ -26,9 +26,9 @@ import (
"sync" "sync"
"time" "time"
staging "k8s.io/client-go/1.5/kubernetes" staging "k8s.io/client-go/kubernetes"
"k8s.io/client-go/1.5/pkg/util/sets" "k8s.io/client-go/pkg/util/sets"
clientreporestclient "k8s.io/client-go/1.5/rest" clientreporestclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors" apierrs "k8s.io/kubernetes/pkg/api/errors"

7
test/e2e/generated_clientset.go
View File

@@ -20,8 +20,7 @@ import (
"strconv" "strconv"
"time" "time"
clientapi "k8s.io/client-go/1.5/pkg/api" clientv1 "k8s.io/client-go/pkg/api/v1"
clientv1 "k8s.io/client-go/1.5/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
@@ -198,7 +197,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
podCopy := stagingClientPod(name, value) podCopy := stagingClientPod(name, value)
pod := &podCopy pod := &podCopy
By("verifying no pod exists before the test") By("verifying no pod exists before the test")
pods, err := podClient.List(clientapi.ListOptions{}) pods, err := podClient.List(clientv1.ListOptions{})
if err != nil { if err != nil {
framework.Failf("Failed to query for pods: %v", err) framework.Failf("Failed to query for pods: %v", err)
} }
@@ -212,7 +211,7 @@ var _ = framework.KubeDescribe("Staging client repo client", func() {
By("verifying the pod is in kubernetes") By("verifying the pod is in kubernetes")
timeout := 1 * time.Minute timeout := 1 * time.Minute
if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) { if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
pods, err = podClient.List(clientapi.ListOptions{}) pods, err = podClient.List(clientv1.ListOptions{})
if err != nil { if err != nil {
return false, err return false, err
} }