github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18999 from wojtek-t/close_watchers

Browse Source 
Close watchers in tests
This commit is contained in:
Filip Grzadkowski 2015-12-22 10:56:25 +01:00
commit 6ac2774dea
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/generic/etcd/etcd_test.go
View File

@ -605,6 +605,7 @@ func TestEtcdWatch(t *testing.T) {
} }
} }
} }
wi.Stop()
} }
server.Terminate(t) server.Terminate(t)

5
pkg/storage/etcd/etcd_watcher_test.go
View File

@ -246,6 +246,7 @@ func TestWatch(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer watching.Stop()
// Test normal case // Test normal case
pod := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}} pod := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
@ -292,6 +293,7 @@ func TestWatchEtcdState(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer watching.Stop()
endpoint := &api.Endpoints{ endpoint := &api.Endpoints{
ObjectMeta: api.ObjectMeta{Name: "foo"}, ObjectMeta: api.ObjectMeta{Name: "foo"},
@ -356,6 +358,7 @@ func TestWatchFromZeroIndex(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer watching.Stop()
// marked as modified b/c of concatenation // marked as modified b/c of concatenation
event := <-watching.ResultChan() event := <-watching.ResultChan()
@ -391,6 +394,7 @@ func TestWatchListFromZeroIndex(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer watching.Stop()
// creates key/foo which should trigger the WatchList for "key" // creates key/foo which should trigger the WatchList for "key"
pod := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}} pod := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
@ -423,6 +427,7 @@ func TestWatchListIgnoresRootKey(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
defer watching.Stop()
// creates key/foo which should trigger the WatchList for "key" // creates key/foo which should trigger the WatchList for "key"
err = h.Create(context.TODO(), key, pod, pod, 0) err = h.Create(context.TODO(), key, pod, pod, 0)