redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Merge branch 'master' into v9

Browse Source 
Signed-off-by: monkey <golang@88.com>
This commit is contained in:
monkey
2021-07-24 22:10:04 +08:00
parent 916da5b2ce 704212eaae
commit 83454856c7
21 changed files with 414 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sentinel_test.go
View File

@ -192,7 +192,7 @@ var _ = Describe("NewFailoverClusterClient", func() {
err = master.Shutdown(ctx).Err()
Expect(err).NotTo(HaveOccurred())
Eventually(func() error {
return sentinelMaster.Ping(ctx).Err()
return master.Ping(ctx).Err()
}, "15s", "100ms").Should(HaveOccurred())
// Check that client picked up new master.