wip

Author: bertinatto

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

@@ -688,7 +688,7 @@ func TestWatchNotHangingOnStartupFailure(t *testing.T) {
 	// constantly failing lists to the underlying storage.
 	dummyErr := fmt.Errorf("dummy")
 	backingStorage := &dummyStorage{err: dummyErr}
-	cacher, _, err := newTestCacherWithoutSyncing(backingStorage, testingclock.NewFakeClock(time.Now()))
+	cacher, _, err := newTestCacherWithoutSyncing(backingStorage)
 	if err != nil {
 		t.Fatalf("Couldn't create cacher: %v", err)
 	}
@@ -3087,44 +3087,3 @@ func TestListIndexer(t *testing.T) {
 		})
 	}
 }
-
-func TestRetryAfterForUnreadyCache(t *testing.T) {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.ResilientWatchCacheInitialization) {
-		t.Skipf("the test requires %v to be enabled", features.ResilientWatchCacheInitialization)
-	}
-	backingStorage := &dummyStorage{}
-	clock := testingclock.NewFakeClock(time.Now())
-	cacher, _, err := newTestCacherWithoutSyncing(backingStorage, clock)
-	if err != nil {
-		t.Fatalf("Couldn't create cacher: %v", err)
-	}
-	defer cacher.Stop()
-	if err = cacher.ready.wait(context.Background()); err != nil {
-		t.Fatalf("Unexpected error waiting for the cache to be ready")
-	}
-
-	cacher.ready.set(false)
-	clock.Step(14 * time.Second)
-
-	opts := storage.ListOptions{
-		ResourceVersion: "0",
-		Predicate:       storage.Everything,
-	}
-	result := &example.PodList{}
-	proxy := NewCacheProxy(cacher, backingStorage)
-	err = proxy.GetList(context.TODO(), "/pods/ns", opts, result)
-
-	if !apierrors.IsTooManyRequests(err) {
-		t.Fatalf("Unexpected GetList error: %v", err)
-	}
-	var statusError apierrors.APIStatus
-	if !errors.As(err, &statusError) {
-		t.Fatalf("Unexpected error: %v, expected apierrors.APIStatus", err)
-	}
-	if statusError.Status().Details == nil {
-		t.Fatalf("Expected to get status details, got none")
-	}
-	if statusError.Status().Details.RetryAfterSeconds != 2 {
-		t.Fatalf("Unexpected retry after: %v", statusError.Status().Details.RetryAfterSeconds)
-	}
-}