Merge pull request #109914 from stevekuznetsov/skuznets/generic-watch-cancel-test

storage/testing: move cancelled watch test to generic package

staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go

@@ -137,23 +137,7 @@ func TestWatchError(t *testing.T) {
 
 func TestWatchContextCancel(t *testing.T) {
 	ctx, store, _ := testSetup(t)
-	canceledCtx, cancel := context.WithCancel(ctx)
+	storagetesting.RunTestWatchContextCancel(ctx, t, store)
-	cancel()
-	// When we watch with a canceled context, we should detect that it's context canceled.
-	// We won't take it as error and also close the watcher.
-	w, err := store.watcher.Watch(canceledCtx, "/abc", 0, false, false, storage.Everything)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case _, ok := <-w.ResultChan():
-		if ok {
-			t.Error("ResultChan() should be closed")
-		}
-	case <-time.After(wait.ForeverTestTimeout):
-		t.Errorf("timeout after %v", wait.ForeverTestTimeout)
-	}
 }
 
 func TestWatchErrResultNotBlockAfterCancel(t *testing.T) {

staging/src/k8s.io/apiserver/pkg/storage/testing/watcher_tests.go

@@ -148,6 +148,29 @@ func RunTestWatchFromNoneZero(ctx context.Context, t *testing.T, store storage.I
 	TestCheckResult(t, watch.Modified, w, out)
 }
 
+func RunTestWatchContextCancel(ctx context.Context, t *testing.T, store storage.Interface) {
+	canceledCtx, cancel := context.WithCancel(ctx)
+	cancel()
+	// When we watch with a canceled context, we should detect that it's context canceled.
+	// We won't take it as error and also close the watcher.
+	w, err := store.Watch(canceledCtx, "/abc", storage.ListOptions{
+		ResourceVersion: "0",
+		Predicate:       storage.Everything,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	select {
+	case _, ok := <-w.ResultChan():
+		if ok {
+			t.Error("ResultChan() should be closed")
+		}
+	case <-time.After(wait.ForeverTestTimeout):
+		t.Errorf("timeout after %v", wait.ForeverTestTimeout)
+	}
+}
+
 func RunTestWatchInitializationSignal(ctx context.Context, t *testing.T, store storage.Interface) {
 	ctx, _ = context.WithTimeout(ctx, 5*time.Second)
 	initSignal := utilflowcontrol.NewInitializationSignal()