From 162ddc10e20d440b25d6f4c042ef23927a0a1993 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Mon, 5 Dec 2016 15:15:47 -0600 Subject: [PATCH] Update to remove artifical etcd client dependencies in the integration tests --- .../integration/objectmeta/objectmeta_test.go | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/test/integration/objectmeta/objectmeta_test.go b/test/integration/objectmeta/objectmeta_test.go index 40d8c0497a7..c98a246baae 100644 --- a/test/integration/objectmeta/objectmeta_test.go +++ b/test/integration/objectmeta/objectmeta_test.go @@ -19,45 +19,21 @@ package objectmeta import ( "testing" - etcd "github.com/coreos/etcd/client" - "github.com/golang/glog" "github.com/stretchr/testify/assert" - "golang.org/x/net/context" - "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/genericapiserver" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/kubernetes/test/integration/framework" ) -// TODO: Eliminate this v2 client dependency. -func newEtcdClient() etcd.Client { - cfg := etcd.Config{ - Endpoints: []string{framework.GetEtcdURLFromEnv()}, - } - client, err := etcd.New(cfg) - if err != nil { - glog.Fatalf("unable to connect to etcd for testing: %v", err) - } - return client -} - func TestIgnoreClusterName(t *testing.T) { config := framework.NewMasterConfig() - prefix := config.StorageFactory.(*genericapiserver.DefaultStorageFactory).StorageConfig.Prefix _, s := framework.RunAMaster(config) defer s.Close() client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(v1.GroupName).GroupVersion}}) - etcdClient := newEtcdClient() - etcdStorage := etcdstorage.NewEtcdStorage(etcdClient, testapi.Default.Codec(), - prefix+"/namespaces/", false, etcdtest.DeserializationCacheSize) - ctx := context.TODO() - ns := v1.Namespace{ ObjectMeta: v1.ObjectMeta{ Name: "test-namespace", @@ -69,20 +45,8 @@ func TestIgnoreClusterName(t *testing.T) { assert.Equal(t, ns.Name, nsNew.Name) assert.Empty(t, nsNew.ClusterName) - nsEtcd := v1.Namespace{} - err = etcdStorage.Get(ctx, ns.Name, "", &nsEtcd, false) - assert.Nil(t, err) - assert.Equal(t, ns.Name, nsEtcd.Name) - assert.Empty(t, nsEtcd.ClusterName) - nsNew, err = client.Core().Namespaces().Update(&ns) assert.Nil(t, err) assert.Equal(t, ns.Name, nsNew.Name) assert.Empty(t, nsNew.ClusterName) - - nsEtcd = v1.Namespace{} - err = etcdStorage.Get(ctx, ns.Name, "", &nsEtcd, false) - assert.Nil(t, err) - assert.Equal(t, ns.Name, nsEtcd.Name) - assert.Empty(t, nsEtcd.ClusterName) }