github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

cacher test: fix leftover v2 test server

Browse Source
This commit is contained in:
Hongchao Deng 2016-11-12 20:48:19 -08:00
parent 454f60c758
commit 1972270f7b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/storage/cacher_test.go
View File

@ -37,6 +37,7 @@ import (
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest" "k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
"k8s.io/kubernetes/pkg/storage/etcd3"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"
@ -45,15 +46,15 @@ import (
) )
func newEtcdTestStorage(t *testing.T, codec runtime.Codec, prefix string) (*etcdtesting.EtcdTestServer, storage.Interface) { func newEtcdTestStorage(t *testing.T, codec runtime.Codec, prefix string) (*etcdtesting.EtcdTestServer, storage.Interface) {
server := etcdtesting.NewEtcdTestClientServer(t) server, _ := etcdtesting.NewUnsecuredEtcd3TestClientServer(t)
storage := etcdstorage.NewEtcdStorage(server.Client, codec, prefix, false, etcdtest.DeserializationCacheSize) storage := etcd3.New(server.V3Client, codec, prefix)
return server, storage return server, storage
} }
func newTestCacher(s storage.Interface) *storage.Cacher { func newTestCacher(s storage.Interface, cap int) *storage.Cacher {
prefix := "pods" prefix := "pods"
config := storage.CacherConfig{ config := storage.CacherConfig{
CacheCapacity: 10, CacheCapacity: cap,
Storage: s, Storage: s,
Versioner: etcdstorage.APIObjectVersioner{}, Versioner: etcdstorage.APIObjectVersioner{},
Type: &api.Pod{}, Type: &api.Pod{},
@ -96,7 +97,7 @@ func updatePod(t *testing.T, s storage.Interface, obj, old *api.Pod) *api.Pod {
func TestList(t *testing.T) { func TestList(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher := newTestCacher(etcdStorage) cacher := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
podFoo := makeTestPod("foo") podFoo := makeTestPod("foo")
@ -210,7 +211,7 @@ func TestWatch(t *testing.T) {
// 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)
cacher := newTestCacher(etcdStorage) cacher := newTestCacher(etcdStorage, 3) // small capacity to trigger "too old version" error
defer cacher.Stop() defer cacher.Stop()
podFoo := makeTestPod("foo") podFoo := makeTestPod("foo")
@ -285,7 +286,7 @@ func TestWatch(t *testing.T) {
func TestWatcherTimeout(t *testing.T) { func TestWatcherTimeout(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher := newTestCacher(etcdStorage) cacher := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
// initialVersion is used to initate the watcher at the beginning of the world, // initialVersion is used to initate the watcher at the beginning of the world,
@ -320,7 +321,7 @@ func TestWatcherTimeout(t *testing.T) {
func TestFiltering(t *testing.T) { func TestFiltering(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher := newTestCacher(etcdStorage) cacher := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
// Ensure that the cacher is initialized, before creating any pods, // Ensure that the cacher is initialized, before creating any pods,
@ -382,7 +383,7 @@ func TestFiltering(t *testing.T) {
func TestStartingResourceVersion(t *testing.T) { func TestStartingResourceVersion(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix()) server, etcdStorage := newEtcdTestStorage(t, testapi.Default.Codec(), etcdtest.PathPrefix())
defer server.Terminate(t) defer server.Terminate(t)
cacher := newTestCacher(etcdStorage) cacher := newTestCacher(etcdStorage, 10)
defer cacher.Stop() defer cacher.Stop()
// add 1 object // add 1 object

6
pkg/storage/etcd/testing/utils.go
View File

@ -63,7 +63,7 @@ type EtcdTestServer struct {
// The following are lumped etcd3 test server params // The following are lumped etcd3 test server params
v3Cluster *integration.ClusterV3 v3Cluster *integration.ClusterV3
v3Client *clientv3.Client V3Client *clientv3.Client
} }
// newLocalListener opens a port localhost using any port // newLocalListener opens a port localhost using any port
@ -314,11 +314,11 @@ func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storageb
server := &EtcdTestServer{ server := &EtcdTestServer{
v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}), v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}),
} }
server.v3Client = server.v3Cluster.RandClient() server.V3Client = server.v3Cluster.RandClient()
config := &storagebackend.Config{ config := &storagebackend.Config{
Type: "etcd3", Type: "etcd3",
Prefix: etcdtest.PathPrefix(), Prefix: etcdtest.PathPrefix(),
ServerList: server.v3Client.Endpoints(), ServerList: server.V3Client.Endpoints(),
DeserializationCacheSize: etcdtest.DeserializationCacheSize, DeserializationCacheSize: etcdtest.DeserializationCacheSize,
} }
return server, config return server, config