fix(test): ssh poll cant support timeout with err (tkestack#1911)

GaoXiaodong · Sep 14, 2022 · 1d2e7a6 · 1d2e7a6
1 parent 8b9b468
commit 1d2e7a6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/util/ssh/ssh.go b/pkg/util/ssh/ssh.go
@@ -358,10 +358,11 @@ func (s *SSH) newClient() (*ssh.Client, func(), error) {
 	}
 	client, err := s.dialer.Dial("tcp", s.addr(), config)
 	if err != nil {
-		err = wait.Poll(5*time.Second, time.Duration(s.Retry)*5*time.Second, func() (bool, error) {
+		wait.Poll(5*time.Second, time.Duration(s.Retry)*5*time.Second, func() (bool, error) {
 			if client, err = s.dialer.Dial("tcp", s.addr(), config); err != nil {
-				return false, err
+				return false, nil
 			}
+			err = nil
 			return true, nil
 		})
 	}