Merge pull request #53 from lalamove/lint

lint ineffassign
lalamove · Jun 18, 2019 · de5140f · de5140f
2 parents be497fe + 2064c58
commit de5140f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/loader/klconsul/consulloader_test.go b/loader/klconsul/consulloader_test.go
@@ -237,13 +237,17 @@ func TestLoad(t *testing.T) {
 
 				var timer = time.NewTimer(150 * time.Millisecond)
 				var watched bool
-				select {
-				case <-hl.Watch():
-					watched = true
-					hl.Close()
-				case <-timer.C:
-					hl.Close()
-					require.True(t, watched)
+			outer:
+				for {
+					select {
+					case <-hl.Watch():
+						watched = true
+						hl.Close()
+					case <-timer.C:
+						hl.Close()
+						require.True(t, watched)
+						break outer
+					}
 				}
 
 				return hl

diff --git a/loader/kletcd/etcdloader_test.go b/loader/kletcd/etcdloader_test.go
@@ -227,12 +227,15 @@ func TestEtcdLoader(t *testing.T) {
 
 			var timer = time.NewTimer(300 * time.Millisecond)
 			var watched bool
-			select {
-			case <-timer.C:
-				l.Close()
-				require.True(t, watched)
-			case <-l.Watch():
-				watched = true
+			for {
+				select {
+				case <-timer.C:
+					l.Close()
+					require.True(t, watched)
+					return
+				case <-l.Watch():
+					watched = true
+				}
 			}
 		},
 	)