Merge pull request #18890 from wojtek-t/fix_etcd_watcher_in_go15

Fix test issue in Go 1.5

Merge pull request #18890 from wojtek-t/fix_etcd_watcher_in_go15
8c60f53c · Wojciech Tyczynski · 8b3c5f97 · 96b5ca0c · 8c60f53c
Commit 8c60f53c authored Dec 18, 2015 by Wojciech Tyczynski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

etcd_watcher_test.go pkg/storage/etcd/etcd_watcher_test.go +2 -2

No files found.
--- a/pkg/storage/etcd/etcd_watcher_test.go
+++ b/pkg/storage/etcd/etcd_watcher_test.go
@@ -227,8 +227,8 @@ func TestWatchEtcdError(t *testing.T) {
 	}
 	server.Terminate(t)
-	got := <-watching.ResultChan()
+	got, ok := <-watching.ResultChan()
-	if got.Type != watch.Error {
+	if ok && got.Type != watch.Error {
 		t.Fatalf("Unexpected non-error")
 	}
 	watching.Stop()