From ab249c4756129453aaf8b323250368f24f782aba Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Thu, 8 Oct 2015 11:20:04 -0700 Subject: [PATCH] Fix tests by adding mocks for additional Watch calls Signed-off-by: Alexandre Beslic --- discovery/kv/kv_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/discovery/kv/kv_test.go b/discovery/kv/kv_test.go index d1e827db7a..e313047d3e 100644 --- a/discovery/kv/kv_test.go +++ b/discovery/kv/kv_test.go @@ -69,8 +69,11 @@ func TestWatch(t *testing.T) { s := d.store.(*libkvmock.Mock) mockCh := make(chan []*store.KVPair) - // The first watch will fail. + // The first watch will fail on those three calls + s.On("Exists", "path/"+discoveryPath).Return(false, errors.New("test error")) + s.On("Put", "path/"+discoveryPath, mock.Anything, mock.Anything).Return(errors.New("test error")) s.On("WatchTree", "path/"+discoveryPath, mock.Anything).Return(mockCh, errors.New("test error")).Once() + // The second one will succeed. s.On("WatchTree", "path/"+discoveryPath, mock.Anything).Return(mockCh, nil).Once() expected := discovery.Entries{ @@ -89,7 +92,7 @@ func TestWatch(t *testing.T) { assert.EqualError(t, <-errCh, "test error") // We have to drain the error channel otherwise Watch will get stuck. go func() { - for _ = range errCh { + for range errCh { } }()