github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in etcd_watcher_test

Browse Source
This commit is contained in:
Wojciech Tyczynski 2015-12-28 10:43:33 +01:00
parent 9bdc4100d5
commit 0b7dce9505
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,8 +462,15 @@ func TestWatchPurposefulShutdown(t *testing.T) {
watching.Stop() watching.Stop()
rt.Gosched() rt.Gosched()
if _, open := <-watching.ResultChan(); open { // There is a race in etcdWatcher so that after calling Stop() one of
t.Errorf("Channel should be closed") // two things can happen:
// - ResultChan() may be closed (triggered by closing userStop channel)
// - an Error "context cancelled" may be emitted (triggered by cancelling request
// to etcd and putting that error to etcdError channel)
// We need to be prepared for both here.
event, open := <-watching.ResultChan()
if open && event.Type != watch.Error {
t.Errorf("Unexpected event from stopped watcher: %#v", event)
} }
} }