Skip to content

Commit 601c0e3

Browse files
committed
cacher: decrease the running time of TestConsistentReadFallback
1 parent cfd6d9a commit 601c0e3

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,17 +435,15 @@ apiserver_watch_cache_consistent_read_total{fallback="true", resource="pods", su
435435
podList.ResourceVersion = tc.watchCacheRV
436436
return nil
437437
}
438-
// TODO: Use fake clock for this test to reduce execution time.
439-
cacher, _, err := newTestCacher(backingStorage)
438+
c := testingclock.NewFakeClock(time.Now())
439+
cacher, _, err := newTestCacherWithoutSyncing(backingStorage, c)
440440
if err != nil {
441441
t.Fatalf("Couldn't create cacher: %v", err)
442442
}
443443
defer cacher.Stop()
444444
proxy := NewCacheProxy(cacher, backingStorage)
445-
if !utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) {
446-
if err := cacher.ready.wait(context.Background()); err != nil {
447-
t.Fatalf("unexpected error waiting for the cache to be ready")
448-
}
445+
if err := cacher.ready.wait(context.Background()); err != nil {
446+
t.Fatalf("unexpected error waiting for the cache to be ready")
449447
}
450448

451449
if fmt.Sprintf("%d", cacher.watchCache.resourceVersion) != tc.watchCacheRV {
@@ -466,8 +464,28 @@ apiserver_watch_cache_consistent_read_total{fallback="true", resource="pods", su
466464
return nil
467465
}
468466
result := &example.PodList{}
467+
468+
ctx, clockStepCancelFn := context.WithTimeout(context.TODO(), time.Minute)
469+
defer clockStepCancelFn()
470+
if tc.expectBlock {
471+
go func(ctx context.Context) {
472+
for {
473+
select {
474+
case <-ctx.Done():
475+
return
476+
default:
477+
if c.HasWaiters() {
478+
c.Step(blockTimeout)
479+
}
480+
time.Sleep(time.Millisecond)
481+
}
482+
}
483+
}(ctx)
484+
}
485+
469486
start := cacher.clock.Now()
470487
err = proxy.GetList(context.TODO(), "pods/ns", storage.ListOptions{ResourceVersion: ""}, result)
488+
clockStepCancelFn()
471489
duration := cacher.clock.Since(start)
472490
if (err != nil) != tc.expectError {
473491
t.Fatalf("Unexpected error err: %v", err)

0 commit comments

Comments
 (0)