Skip to content

K
k3s
Commit 9a9c9891 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31323 from hongchaodeng/testwatch

Automatic merge from submit-queue Separate test watch from zero and nonzero Recently there was spike flakes for this. See #31079. This is to split the test into two units for further digging. We need to know which one is problematic, or both.
parents ca5879bd 874cc7f2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
pkg/storage/etcd3/watcher_test.go
View file @ 9a9c9891
...@@ -141,10 +141,10 @@ func TestDeleteTriggerWatch(t *testing.T) { ...@@ -141,10 +141,10 @@ func TestDeleteTriggerWatch(t *testing.T) {
testCheckEventType(t, watch.Deleted, w) testCheckEventType(t, watch.Deleted, w)
} }
// TestWatchSync tests that // TestWatchFromZero tests that
// - watch from 0 should sync up and grab the object added before // - watch from 0 should sync up and grab the object added before
// - watch from non-0 should just watch changes after given version // - watch from non-0 should just watch changes after given version
func TestWatchFromZeroAndNoneZero(t *testing.T) { func TestWatchFromZero(t *testing.T) {
ctx, store, cluster := testSetup(t) ctx, store, cluster := testSetup(t)
defer cluster.Terminate(t) defer cluster.Terminate(t)
key, storedObj := testPropogateStore(t, store, ctx, &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}) key, storedObj := testPropogateStore(t, store, ctx, &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}})
...@@ -154,10 +154,16 @@ func TestWatchFromZeroAndNoneZero(t *testing.T) { ...@@ -154,10 +154,16 @@ func TestWatchFromZeroAndNoneZero(t *testing.T) {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }
testCheckResult(t, 0, watch.Added, w, storedObj) testCheckResult(t, 0, watch.Added, w, storedObj)
w.Stop() }
testCheckStop(t, 0, w)
w, err = store.Watch(ctx, key, storedObj.ResourceVersion, storage.Everything) // TestWatchFromNoneZero tests that
// - watch from non-0 should just watch changes after given version
func TestWatchFromNoneZero(t *testing.T) {
ctx, store, cluster := testSetup(t)
defer cluster.Terminate(t)
key, storedObj := testPropogateStore(t, store, ctx, &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}})
w, err := store.Watch(ctx, key, storedObj.ResourceVersion, storage.Everything)
if err != nil { if err != nil {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment