github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31323 from hongchaodeng/testwatch

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2016-08-24 12:19:00 -07:00 committed by GitHub
commit 9a9c98912b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/storage/etcd3/watcher_test.go
View File

@ -141,10 +141,10 @@ func TestDeleteTriggerWatch(t *testing.T) {
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 non-0 should just watch changes after given version
func TestWatchFromZeroAndNoneZero(t *testing.T) {
func TestWatchFromZero(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"}})
@ -154,10 +154,16 @@ func TestWatchFromZeroAndNoneZero(t *testing.T) {
t.Fatalf("Watch failed: %v", err)
}
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 {
t.Fatalf("Watch failed: %v", err)
}