github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert #32012 (Unshare cluster in each test suite)

Browse Source 
Since #33393 is merged, the bug should have been fixed.
This commit is contained in:
Hongchao Deng 2016-09-27 09:38:16 -07:00
parent 987aef1f64
commit 35917e552a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,8 @@ func TestWatchList(t *testing.T) {
// - update should trigger Modified event // - update should trigger Modified event
// - update that gets filtered should trigger Deleted event // - update that gets filtered should trigger Deleted event
func testWatch(t *testing.T, recursive bool) { func testWatch(t *testing.T, recursive bool) {
ctx, store, cluster := testSetup(t)
defer cluster.Terminate(t)
podFoo := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}} podFoo := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
podBar := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "bar"}} podBar := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "bar"}}
@ -90,7 +92,6 @@ func testWatch(t *testing.T, recursive bool) {
}, },
}} }}
for i, tt := range tests { for i, tt := range tests {
ctx, store, cluster := testSetup(t)
w, err := store.watch(ctx, tt.key, "0", storage.SimpleFilter(tt.pred), recursive) w, err := store.watch(ctx, tt.key, "0", storage.SimpleFilter(tt.pred), recursive)
if err != nil { if err != nil {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
@ -121,7 +122,6 @@ func testWatch(t *testing.T, recursive bool) {
} }
w.Stop() w.Stop()
testCheckStop(t, i, w) testCheckStop(t, i, w)
cluster.Terminate(t)
} }
} }