[Federation][init-08] Refactor the tests by pulling the common utilities into a testing package.

federation/pkg/kubefed/BUILD

@@ -50,20 +50,18 @@ go_test(
     deps = [
         "//federation/apis/federation:go_default_library",
         "//federation/apis/federation/v1beta1:go_default_library",
+        "//federation/pkg/kubefed/testing:go_default_library",
         "//federation/pkg/kubefed/util:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/errors:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/unversioned:go_default_library",
         "//pkg/api/v1:go_default_library",
-        "//pkg/apimachinery/registered:go_default_library",
-        "//pkg/client/restclient:go_default_library",
         "//pkg/client/restclient/fake:go_default_library",
         "//pkg/client/typed/dynamic:go_default_library",
         "//pkg/client/unversioned/clientcmd:go_default_library",
         "//pkg/client/unversioned/clientcmd/api:go_default_library",
         "//pkg/kubectl/cmd/testing:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
-        "//pkg/runtime:go_default_library",
     ],
 )

federation/pkg/kubefed/init/init.go

@@ -242,7 +242,7 @@ func waitForLoadBalancerAddress(clientset *client.Clientset, svc *api.Service) (
 	ips := []string{}
 	hostnames := []string{}
 
-	err := wait.PollInfinite(lbAddrRetryInterval, func() (bool, error) {
+	err := wait.PollImmediateInfinite(lbAddrRetryInterval, func() (bool, error) {
 		pollSvc, err := clientset.Core().Services(svc.Namespace).Get(svc.Name)
 		if err != nil {
 			return false, nil

federation/pkg/kubefed/join_test.go

@@ -19,27 +19,23 @@ package kubefed
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"net/http"
-	"os"
 	"testing"
 
 	federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
+	kubefedtesting "k8s.io/kubernetes/federation/pkg/kubefed/testing"
 	"k8s.io/kubernetes/federation/pkg/kubefed/util"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apimachinery/registered"
-	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/client/restclient/fake"
 	"k8s.io/kubernetes/pkg/client/typed/dynamic"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/runtime"
 )
 
 func TestJoinFederation(t *testing.T) {
@@ -48,11 +44,11 @@ func TestJoinFederation(t *testing.T) {
 		cmdErrMsg = str
 	})
 
-	fakeKubeFiles, err := fakeKubeconfigFiles()
+	fakeKubeFiles, err := kubefedtesting.FakeKubeconfigFiles()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	defer rmFakeKubeconfigFiles(fakeKubeFiles)
+	defer kubefedtesting.RemoveFakeKubeconfigFiles(fakeKubeFiles)
 
 	testCases := []struct {
 		cluster            string
@@ -111,7 +107,7 @@ func TestJoinFederation(t *testing.T) {
 			t.Fatalf("[%d] unexpected error: %v", i, err)
 		}
 
-		adminConfig, err := newFakeAdminConfig(hostFactory, tc.kubeconfigGlobal)
+		adminConfig, err := kubefedtesting.NewFakeAdminConfig(hostFactory, tc.kubeconfigGlobal)
 		if err != nil {
 			t.Fatalf("[%d] unexpected error: %v", i, err)
 		}
@@ -162,7 +158,7 @@ func testJoinFederationFactory(name, server string) cmdutil.Factory {
 				if !api.Semantic.DeepEqual(got, want) {
 					return nil, fmt.Errorf("unexpected cluster object\n\tgot: %#v\n\twant: %#v", got, want)
 				}
-				return &http.Response{StatusCode: http.StatusCreated, Header: defaultHeader(), Body: objBody(codec, &want)}, nil
+				return &http.Response{StatusCode: http.StatusCreated, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &want)}, nil
 			default:
 				return nil, fmt.Errorf("unexpected request: %#v\n%#v", req.URL, req)
 			}
@@ -172,30 +168,6 @@ func testJoinFederationFactory(name, server string) cmdutil.Factory {
 	return f
 }
 
-type fakeAdminConfig struct {
-	pathOptions *clientcmd.PathOptions
-	hostFactory cmdutil.Factory
-}
-
-func newFakeAdminConfig(f cmdutil.Factory, kubeconfigGlobal string) (util.AdminConfig, error) {
-	pathOptions := clientcmd.NewDefaultPathOptions()
-	pathOptions.GlobalFile = kubeconfigGlobal
-	pathOptions.EnvVar = ""
-
-	return &fakeAdminConfig{
-		pathOptions: pathOptions,
-		hostFactory: f,
-	}, nil
-}
-
-func (f *fakeAdminConfig) PathOptions() *clientcmd.PathOptions {
-	return f.pathOptions
-}
-
-func (f *fakeAdminConfig) HostFactory(host, kubeconfigPath string) cmdutil.Factory {
-	return f.hostFactory
-}
-
 func fakeJoinHostFactory(name, server, token string) (cmdutil.Factory, error) {
 	kubeconfig := clientcmdapi.Config{
 		Clusters: map[string]*clientcmdapi.Cluster{
@@ -227,7 +199,7 @@ func fakeJoinHostFactory(name, server, token string) (cmdutil.Factory, error) {
 		},
 		ObjectMeta: v1.ObjectMeta{
 			Name:      name,
-			Namespace: "federation-system",
+			Namespace: util.DefaultFederationSystemNamespace,
 		},
 		Data: map[string][]byte{
 			"kubeconfig": configBytes,
@@ -236,7 +208,7 @@ func fakeJoinHostFactory(name, server, token string) (cmdutil.Factory, error) {
 
 	f, tf, codec, _ := cmdtesting.NewAPIFactory()
 	ns := dynamic.ContentConfig().NegotiatedSerializer
-	tf.ClientConfig = defaultClientConfig()
+	tf.ClientConfig = kubefedtesting.DefaultClientConfig()
 	tf.Client = &fake.RESTClient{
 		NegotiatedSerializer: ns,
 		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
@@ -254,7 +226,7 @@ func fakeJoinHostFactory(name, server, token string) (cmdutil.Factory, error) {
 				if !api.Semantic.DeepEqual(got, secretObject) {
 					return nil, fmt.Errorf("Unexpected secret object\n\tgot: %#v\n\twant: %#v", got, secretObject)
 				}
-				return &http.Response{StatusCode: http.StatusCreated, Header: defaultHeader(), Body: objBody(codec, &secretObject)}, nil
+				return &http.Response{StatusCode: http.StatusCreated, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &secretObject)}, nil
 			default:
 				return nil, fmt.Errorf("unexpected request: %#v\n%#v", req.URL, req)
 			}
@@ -281,113 +253,3 @@ func fakeCluster(name, server string) federationapi.Cluster {
 		},
 	}
 }
-
-func fakeKubeconfigFiles() ([]string, error) {
-	kubeconfigs := []clientcmdapi.Config{
-		{
-			Clusters: map[string]*clientcmdapi.Cluster{
-				"syndicate": {
-					Server: "https://10.20.30.40",
-				},
-			},
-			AuthInfos: map[string]*clientcmdapi.AuthInfo{
-				"syndicate": {
-					Token: "badge",
-				},
-			},
-			Contexts: map[string]*clientcmdapi.Context{
-				"syndicate": {
-					Cluster:  "syndicate",
-					AuthInfo: "syndicate",
-				},
-			},
-			CurrentContext: "syndicate",
-		},
-		{
-			Clusters: map[string]*clientcmdapi.Cluster{
-				"ally": {
-					Server: "ally256.example.com:80",
-				},
-			},
-			AuthInfos: map[string]*clientcmdapi.AuthInfo{
-				"ally": {
-					Token: "souvenir",
-				},
-			},
-			Contexts: map[string]*clientcmdapi.Context{
-				"ally": {
-					Cluster:  "ally",
-					AuthInfo: "ally",
-				},
-			},
-			CurrentContext: "ally",
-		},
-		{
-			Clusters: map[string]*clientcmdapi.Cluster{
-				"ally": {
-					Server: "https://ally64.example.com",
-				},
-				"confederate": {
-					Server: "10.8.8.8",
-				},
-			},
-			AuthInfos: map[string]*clientcmdapi.AuthInfo{
-				"ally": {
-					Token: "souvenir",
-				},
-				"confederate": {
-					Token: "totem",
-				},
-			},
-			Contexts: map[string]*clientcmdapi.Context{
-				"ally": {
-					Cluster:  "ally",
-					AuthInfo: "ally",
-				},
-				"confederate": {
-					Cluster:  "confederate",
-					AuthInfo: "confederate",
-				},
-			},
-			CurrentContext: "confederate",
-		},
-	}
-	kubefiles := []string{}
-	for _, cfg := range kubeconfigs {
-		fakeKubeFile, _ := ioutil.TempFile("", "")
-		err := clientcmd.WriteToFile(cfg, fakeKubeFile.Name())
-		if err != nil {
-			return nil, err
-		}
-
-		kubefiles = append(kubefiles, fakeKubeFile.Name())
-	}
-	return kubefiles, nil
-}
-
-func rmFakeKubeconfigFiles(kubefiles []string) {
-	for _, file := range kubefiles {
-		os.Remove(file)
-	}
-}
-
-func defaultHeader() http.Header {
-	header := http.Header{}
-	header.Set("Content-Type", runtime.ContentTypeJSON)
-	return header
-}
-
-func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj))))
-}
-
-func defaultClientConfig() *restclient.Config {
-	return &restclient.Config{
-		APIPath: "/api",
-		ContentConfig: restclient.ContentConfig{
-			NegotiatedSerializer: api.Codecs,
-			ContentType:          runtime.ContentTypeJSON,
-			GroupVersion:         &registered.GroupOrDie(api.GroupName).GroupVersion,
-		},
-	}
-}

federation/pkg/kubefed/testing/BUILD

@@ -0,0 +1,27 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["testing.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//federation/pkg/kubefed/util:go_default_library",
+        "//pkg/api:go_default_library",
+        "//pkg/apimachinery/registered:go_default_library",
+        "//pkg/client/restclient:go_default_library",
+        "//pkg/client/unversioned/clientcmd:go_default_library",
+        "//pkg/client/unversioned/clientcmd/api:go_default_library",
+        "//pkg/kubectl/cmd/util:go_default_library",
+        "//pkg/runtime:go_default_library",
+    ],
+)