From 962f6a88e27fff9d28248fd46b880b3ee43fff88 Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Wed, 19 Jul 2023 23:52:36 +0200 Subject: [PATCH] Due to races the test can get one of two error messages. Only one was expected earlier causing flakiness Signed-off-by: Rohit Nayak --- go/vt/vtgate/tabletgateway_flaky_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/go/vt/vtgate/tabletgateway_flaky_test.go b/go/vt/vtgate/tabletgateway_flaky_test.go index dd3b9c21790..80a93808486 100644 --- a/go/vt/vtgate/tabletgateway_flaky_test.go +++ b/go/vt/vtgate/tabletgateway_flaky_test.go @@ -318,7 +318,11 @@ func TestInconsistentStateDetectedBuffering(t *testing.T) { case <-queryChan: require.Nil(t, res) require.Error(t, err) - require.Equal(t, "target: ks1.-80.primary: inconsistent state detected, primary is serving but initially found no available tablet", err.Error()) + // depending on whether the health check ticks before or after the buffering code, we might get different errors + if !(err.Error() == "target: ks1.-80.primary: inconsistent state detected, primary is serving but initially found no available tablet" || + err.Error() == "target: ks1.-80.primary: no healthy tablet available for 'keyspace:\"ks1\" shard:\"-80\" tablet_type:PRIMARY'") { + t.Fatalf("wrong error returned: %v", err) + } case <-time.After(15 * time.Second): t.Fatalf("timed out waiting for query to execute") }