github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125722 from serathius/remove-5s

Browse Source 
Remove 5 seconds from TestWatchStreamSeparation execution by reusing etcdserver
This commit is contained in:
Kubernetes Prow Robot 2024-06-26 03:34:20 -07:00 committed by GitHub
commit 4b2fafc75e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go
View File

@ -2471,6 +2471,25 @@ func TestGetBookmarkAfterResourceVersionLockedFunc(t *testing.T) {
} }
func TestWatchStreamSeparation(t *testing.T) { func TestWatchStreamSeparation(t *testing.T) {
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
t.Cleanup(func() {
server.Terminate(t)
})
setupOpts := &setupOptions{}
withDefaults(setupOpts)
config := Config{
Storage: etcdStorage,
Versioner: storage.APIObjectVersioner{},
GroupResource: schema.GroupResource{Resource: "pods"},
ResourcePrefix: setupOpts.resourcePrefix,
KeyFunc: setupOpts.keyFunc,
GetAttrsFunc: GetPodAttrs,
NewFunc: newPod,
NewListFunc: newPodList,
IndexerFuncs: setupOpts.indexerFuncs,
Codec: codecs.LegacyCodec(examplev1.SchemeGroupVersion),
Clock: setupOpts.clock,
}
tcs := []struct { tcs := []struct {
name string name string
separateCacheWatchRPC bool separateCacheWatchRPC bool
@ -2508,8 +2527,10 @@ func TestWatchStreamSeparation(t *testing.T) {
for _, tc := range tcs { for _, tc := range tcs {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SeparateCacheWatchRPC, tc.separateCacheWatchRPC) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SeparateCacheWatchRPC, tc.separateCacheWatchRPC)
_, cacher, _, terminate := testSetupWithEtcdServer(t) cacher, err := NewCacherFromConfig(config)
t.Cleanup(terminate) if err != nil {
t.Fatalf("Failed to initialize cacher: %v", err)
}
if !utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) { if !utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) {
if err := cacher.ready.wait(context.TODO()); err != nil { if err := cacher.ready.wait(context.TODO()); err != nil {
@ -2527,7 +2548,11 @@ func TestWatchStreamSeparation(t *testing.T) {
waitForEtcdBookmark := watchAndWaitForBookmark(t, waitContext, cacher.storage) waitForEtcdBookmark := watchAndWaitForBookmark(t, waitContext, cacher.storage)
var out example.Pod var out example.Pod
err := cacher.Create(context.Background(), "foo", &example.Pod{}, &out, 0) err = cacher.Create(context.Background(), "foo", &example.Pod{}, &out, 0)
if err != nil {
t.Fatal(err)
}
err = cacher.Delete(context.Background(), "foo", &out, nil, storage.ValidateAllObjectFunc, &example.Pod{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }