kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move etcd/testing to etcd3/testing 

Kubernetes-commit: 7497260e54c555c1fb1def741267f9dc23fe7dce
This commit is contained in:
wojtekt 2019-07-01 10:38:19 +02:00 committed by Kubernetes Publisher
parent 72472787a2
commit 9698803236
7 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/generic/registry/dryrun_test.go
View File

@ -31,12 +31,12 @@ import (
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
"k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/apiserver/pkg/storage/storagebackend/factory"
) )
func NewDryRunnableTestStorage(t *testing.T) (DryRunnableStorage, func()) { func NewDryRunnableTestStorage(t *testing.T) (DryRunnableStorage, func()) {
server, sc := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion) sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion)
s, destroy, err := factory.Create(*sc) s, destroy, err := factory.Create(*sc)
if err != nil { if err != nil {

4
pkg/registry/generic/registry/store_test.go
View File

@ -49,8 +49,8 @@ import (
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
cacherstorage "k8s.io/apiserver/pkg/storage/cacher" cacherstorage "k8s.io/apiserver/pkg/storage/cacher"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/etcd3"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
"k8s.io/apiserver/pkg/storage/names" "k8s.io/apiserver/pkg/storage/names"
"k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/apiserver/pkg/storage/storagebackend/factory"
storagetesting "k8s.io/apiserver/pkg/storage/testing" storagetesting "k8s.io/apiserver/pkg/storage/testing"
@ -1537,7 +1537,7 @@ func TestStoreWatch(t *testing.T) {
func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheEnabled bool) (factory.DestroyFunc, *Store) { func newTestGenericStoreRegistry(t *testing.T, scheme *runtime.Scheme, hasCacheEnabled bool) (factory.DestroyFunc, *Store) {
podPrefix := "/pods" podPrefix := "/pods"
server, sc := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) server, sc := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
strategy := &testRESTStrategy{scheme, names.SimpleNameGenerator, true, false, true} strategy := &testRESTStrategy{scheme, names.SimpleNameGenerator, true, false, true}
sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion) sc.Codec = apitesting.TestStorageCodec(codecs, examplev1.SchemeGroupVersion)

9
pkg/storage/etcd/testing/test_server.go → pkg/storage/etcd3/testing/test_server.go
View File

@ -28,7 +28,7 @@ import (
"time" "time"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" "k8s.io/apiserver/pkg/storage/etcd3/testing/testingcert"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
"context" "context"
@ -100,7 +100,8 @@ func newSecuredLocalListener(t *testing.T, certFile, keyFile, caFile string) net
return l return l
} }
func newHttpTransport(t *testing.T, certFile, keyFile, caFile string) etcd.CancelableTransport { // newHTTPTransport create a new tls-based transport.
func newHTTPTransport(t *testing.T, certFile, keyFile, caFile string) etcd.CancelableTransport {
tlsInfo := transport.TLSInfo{ tlsInfo := transport.TLSInfo{
CertFile: certFile, CertFile: certFile,
KeyFile: keyFile, KeyFile: keyFile,
@ -269,7 +270,7 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer {
cfg := etcd.Config{ cfg := etcd.Config{
Endpoints: server.ClientURLs.StringSlice(), Endpoints: server.ClientURLs.StringSlice(),
Transport: newHttpTransport(t, server.CertFile, server.KeyFile, server.CAFile), Transport: newHTTPTransport(t, server.CertFile, server.KeyFile, server.CAFile),
} }
server.Client, err = etcd.New(cfg) server.Client, err = etcd.New(cfg)
if err != nil { if err != nil {
@ -285,7 +286,7 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer {
return server return server
} }
// NewEtcd3TestClientServer creates a new client and server for testing // NewUnsecuredEtcd3TestClientServer creates a new client and server for testing
func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storagebackend.Config) { func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storagebackend.Config) {
server := &EtcdTestServer{ server := &EtcdTestServer{
v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}), v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}),

0
pkg/storage/etcd/testing/testingcert/certificates.go → pkg/storage/etcd3/testing/testingcert/certificates.go
View File

4
pkg/storage/etcd/testing/utils.go → pkg/storage/etcd3/testing/utils.go
View File

@ -21,7 +21,7 @@ import (
"path" "path"
) )
// Returns the prefix set via the ETCD_PREFIX environment variable (if any). // PathPrefix returns the prefix set via the ETCD_PREFIX environment variable (if any).
func PathPrefix() string { func PathPrefix() string {
pref := os.Getenv("ETCD_PREFIX") pref := os.Getenv("ETCD_PREFIX")
if pref == "" { if pref == "" {
@ -30,7 +30,7 @@ func PathPrefix() string {
return path.Join("/", pref) return path.Join("/", pref)
} }
// Adds the ETCD_PREFIX to the provided key // AddPrefix adds the ETCD_PREFIX to the provided key
func AddPrefix(in string) string { func AddPrefix(in string) string {
return path.Join(PathPrefix(), in) return path.Join(PathPrefix(), in)
} }

2
pkg/storage/storagebackend/factory/tls_test.go
View File

@ -34,7 +34,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/apis/example" "k8s.io/apiserver/pkg/apis/example"
examplev1 "k8s.io/apiserver/pkg/apis/example/v1" examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" "k8s.io/apiserver/pkg/storage/etcd3/testing/testingcert"
"k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storage/storagebackend"
) )

30
pkg/storage/tests/cacher_test.go
View File

@ -43,8 +43,8 @@ import (
"k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
cacherstorage "k8s.io/apiserver/pkg/storage/cacher" cacherstorage "k8s.io/apiserver/pkg/storage/cacher"
etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
"k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/etcd3"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
storagetesting "k8s.io/apiserver/pkg/storage/testing" storagetesting "k8s.io/apiserver/pkg/storage/testing"
"k8s.io/apiserver/pkg/storage/value" "k8s.io/apiserver/pkg/storage/value"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
@ -93,8 +93,8 @@ func AddObjectMetaFieldsSet(source fields.Set, objectMeta *metav1.ObjectMeta, ha
return source return source
} }
func newEtcdTestStorage(t *testing.T, prefix string) (*etcdtesting.EtcdTestServer, storage.Interface) { func newEtcdTestStorage(t *testing.T, prefix string) (*etcd3testing.EtcdTestServer, storage.Interface) {
server, _ := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) server, _ := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
storage := etcd3.New(server.V3Client, apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion), prefix, value.IdentityTransformer, true) storage := etcd3.New(server.V3Client, apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion), prefix, value.IdentityTransformer, true)
return server, storage return server, storage
} }
@ -146,7 +146,7 @@ func updatePod(t *testing.T, s storage.Interface, obj, old *example.Pod) *exampl
} }
func TestGet(t *testing.T) { func TestGet(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, _ := newTestCacher(etcdStorage, 10) cacher, _ := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -177,7 +177,7 @@ func TestGet(t *testing.T) {
} }
func TestGetToList(t *testing.T) { func TestGetToList(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, _ := newTestCacher(etcdStorage, 10) cacher, _ := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -233,7 +233,7 @@ func TestGetToList(t *testing.T) {
} }
func TestList(t *testing.T) { func TestList(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, _ := newTestCacher(etcdStorage, 10) cacher, _ := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -314,7 +314,7 @@ func TestList(t *testing.T) {
} }
func TestInfiniteList(t *testing.T) { func TestInfiniteList(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, v := newTestCacher(etcdStorage, 10) cacher, v := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -368,7 +368,7 @@ func (self *injectListError) List(ctx context.Context, key string, resourceVersi
} }
func TestWatch(t *testing.T) { func TestWatch(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
// Inject one list error to make sure we test the relist case. // Inject one list error to make sure we test the relist case.
etcdStorage = &injectListError{errors: 1, Interface: etcdStorage} etcdStorage = &injectListError{errors: 1, Interface: etcdStorage}
defer server.Terminate(t) defer server.Terminate(t)
@ -445,7 +445,7 @@ func TestWatch(t *testing.T) {
} }
func TestWatcherTimeout(t *testing.T) { func TestWatcherTimeout(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, _ := newTestCacher(etcdStorage, 10) cacher, _ := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -487,7 +487,7 @@ func TestWatcherTimeout(t *testing.T) {
} }
func TestFiltering(t *testing.T) { func TestFiltering(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, _ := newTestCacher(etcdStorage, 10) cacher, _ := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -549,7 +549,7 @@ func TestFiltering(t *testing.T) {
} }
func TestStartingResourceVersion(t *testing.T) { func TestStartingResourceVersion(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, v := newTestCacher(etcdStorage, 10) cacher, v := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -597,7 +597,7 @@ func TestStartingResourceVersion(t *testing.T) {
} }
func TestEmptyWatchEventCache(t *testing.T) { func TestEmptyWatchEventCache(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
// add a few objects // add a few objects
@ -661,7 +661,7 @@ func TestEmptyWatchEventCache(t *testing.T) {
} }
func TestRandomWatchDeliver(t *testing.T) { func TestRandomWatchDeliver(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, v := newTestCacher(etcdStorage, 10) cacher, v := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -787,7 +787,7 @@ func TestCacherListerWatcherPagination(t *testing.T) {
func TestWatchDispatchBookmarkEvents(t *testing.T) { func TestWatchDispatchBookmarkEvents(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)()
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, v := newTestCacher(etcdStorage, 10) cacher, v := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
@ -849,7 +849,7 @@ func TestWatchDispatchBookmarkEvents(t *testing.T) {
func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) { func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.WatchBookmark, true)()
server, etcdStorage := newEtcdTestStorage(t, etcdtesting.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher, v := newTestCacher(etcdStorage, 10) cacher, v := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()