From 57b451cfb6738fca45fc05cd50c1ff6d7240e3a7 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 5 Nov 2019 22:06:10 -0800 Subject: [PATCH] Fix watch test to expect Expired instead of Gone --- .../src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index acf7a521812..4b66b960240 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -444,8 +444,8 @@ func TestWatch(t *testing.T) { } defer tooOldWatcher.Stop() // Ensure we get a "Gone" error - expectedGoneError := errors.NewGone("").ErrStatus - verifyWatchEvent(t, tooOldWatcher, watch.Error, &expectedGoneError) + expectedResourceExpiredError := errors.NewResourceExpired("").ErrStatus + verifyWatchEvent(t, tooOldWatcher, watch.Error, &expectedResourceExpiredError) initialWatcher, err := cacher.Watch(context.TODO(), "pods/ns/foo", fooCreated.ResourceVersion, storage.Everything) if err != nil { @@ -668,8 +668,8 @@ func TestEmptyWatchEventCache(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } defer watcher.Stop() - expectedGoneError := errors.NewGone("").ErrStatus - verifyWatchEvent(t, watcher, watch.Error, &expectedGoneError) + expectedResourceExpiredError := errors.NewResourceExpired("").ErrStatus + verifyWatchEvent(t, watcher, watch.Error, &expectedResourceExpiredError) } {