Merge pull request #105611 from tbg/TestVerifyDialback

cockroachdb · Jun 27, 2023 · 4c7ff06 · 4c7ff06
2 parents aa9ca41 + 2b2ae9a
commit 4c7ff06
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/rpc/context_test.go b/pkg/rpc/context_test.go
@@ -2739,8 +2739,14 @@ func TestHeartbeatDialback(t *testing.T) {
 		case ping := <-pingChan2:
 			log.Infof(ctx, "Received %+v", ping)
 		case <-time.After(1 * time.Second):
-			require.ErrorAs(t, ctx1.ConnHealth(remoteAddr2, 2, DefaultClass), &ErrNoConnection)
-			require.ErrorAs(t, ctx2.ConnHealth(remoteAddr1, 1, SystemClass), &ErrNoConnection)
+			{
+				err1 := ctx1.ConnHealth(remoteAddr2, 2, DefaultClass)
+				require.True(t, errors.HasType(err1, ErrNoConnection), "%+v", err1)
+			}
+			{
+				err2 := ctx2.ConnHealth(remoteAddr1, 1, SystemClass)
+				require.True(t, errors.HasType(err2, ErrNoConnection), "%+v", err2)
+			}
 			return
 		}
 	}