github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32012 from hongchaodeng/f

Browse Source 
Automatic merge from submit-queue

Unshare cluster, store in each test suite

For https://github.com/kubernetes/kubernetes/issues/31962 and https://github.com/kubernetes/kubernetes/issues/31300.

Just try to unshare it to minimize interface and focus on correctness of logic.
This commit is contained in:
Kubernetes Submit Queue 2016-09-05 00:09:39 -07:00 committed by GitHub
commit 7f3ce7b320
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,6 @@ func TestWatchList(t *testing.T) {
// - update should trigger Modified event
// - update that gets filtered should trigger Deleted event
func testWatch(t *testing.T, recursive bool) {
ctx, store, cluster := testSetup(t)
defer cluster.Terminate(t)
podFoo := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
podBar := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "bar"}}
@ -93,6 +90,7 @@ func testWatch(t *testing.T, recursive bool) {
trigger: storage.NoTriggerFunc,
}}
for i, tt := range tests {
ctx, store, cluster := testSetup(t)
filter := storage.NewSimpleFilter(tt.filter, tt.trigger)
w, err := store.watch(ctx, tt.key, "0", filter, recursive)
if err != nil {
@ -124,6 +122,7 @@ func testWatch(t *testing.T, recursive bool) {
}
w.Stop()
testCheckStop(t, i, w)
cluster.Terminate(t)
}
}