Merge pull request #12407 from tangcong/fix-networkpartition-flaky-test

clientv3test: fix network partition flaky test
etcd-io · Oct 20, 2020 · d5363e3 · d5363e3
2 parents 7c6c2c1 + 0a830c8
commit d5363e3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/integration/clientv3/network_partition_test.go b/tests/integration/clientv3/network_partition_test.go
@@ -74,7 +74,7 @@ func TestBalancerUnderNetworkPartitionTxn(t *testing.T) {
 func TestBalancerUnderNetworkPartitionLinearizableGetWithLongTimeout(t *testing.T) {
 	testBalancerUnderNetworkPartition(t, func(cli *clientv3.Client, ctx context.Context) error {
 		_, err := cli.Get(ctx, "a")
-		if err == rpctypes.ErrTimeout {
+		if isClientTimeout(err) || isServerCtxTimeout(err) || err == rpctypes.ErrTimeout {
 			return errExpected
 		}
 		return err