From bad1d030e8b38f78e7e43205b0c9ac28ed00b8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=B1=E5=B2=9A?=
 <36239017+YuJuncen@users.noreply.github.com>
Date: Sat, 2 Apr 2022 16:08:30 +0800
Subject: [PATCH] cherry pick #33666 to release-5.3

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 br/tests/br_s3/run.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/br/tests/br_s3/run.sh b/br/tests/br_s3/run.sh
index d0c20996db7ef..a919cb2f9742b 100755
--- a/br/tests/br_s3/run.sh
+++ b/br/tests/br_s3/run.sh
@@ -37,7 +37,12 @@ start_s3() {
     bin/minio server --address $S3_ENDPOINT "$TEST_DIR/$DB" &
     s3_pid=$!
     i=0
+<<<<<<< HEAD
     while ! curl -o /dev/null -v -s "http://$S3_ENDPOINT/"; do
+=======
+    status="$(curl -o /dev/null -v -s "http://$S3_ENDPOINT/" -w '%{http_code}' || true)"
+    while ! { [ "$status" -gt 0 ] && [ "$status" -lt 500 ]; } ; do
+>>>>>>> b85729315... br: Fix unstable s3 test (again) (#33666)
         i=$(($i+1))
         if [ $i -gt 30 ]; then
             echo 'Failed to start minio'