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/gomega"
"k8s.io/client-go/1.5/kubernetes"
apiapi "k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/api/unversioned"
api "k8s.io/client-go/1.5/pkg/api/v1"
extensions "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
policy "k8s.io/client-go/1.5/pkg/apis/policy/v1alpha1"
"k8s.io/client-go/1.5/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api/unversioned"
api "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
policy "k8s.io/client-go/pkg/apis/policy/v1alpha1"
"k8s.io/client-go/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
)
@@ -132,7 +131,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() {
// Locate a running pod.
var pod api.Pod
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 {
return false, err
}