From 90ab2368dd247da73d1cc58c726fc7fc089e86ed Mon Sep 17 00:00:00 2001
From: Shlomi Noach <shlomi-noach@github.com>
Date: Sun, 11 Aug 2019 15:21:04 +0300
Subject: [PATCH] graceful sleep; remove extra debug info

---
 localtests/test.sh                  | 17 ++---------------
 script/cibuild-gh-ost-replica-tests |  2 --
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/localtests/test.sh b/localtests/test.sh
index 0a913ae..d4b3f17 100755
--- a/localtests/test.sh
+++ b/localtests/test.sh
@@ -50,21 +50,8 @@ verify_master_and_replica() {
   original_sql_mode="$(gh-ost-test-mysql-master -e "select @@global.sql_mode" -s -s)"
   echo "sql_mode on master is ${original_sql_mode}"
 
-  gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
-  gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
-  sleep 1
-  gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
-  gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
-  sleep 1
-  gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
-  gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
-  sleep 1
-  gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
-  gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
-  sleep 1
-  gh-ost-test-mysql-replica -uroot -proot -e "select 1 as root" -ss
-  gh-ost-test-mysql-replica -e "select 1 as msandbox" -ss
-  sleep 1
+  echo "Gracefully sleeping for 3 seconds while replica is setting up..."
+  sleep 3
 
   if [ "$(gh-ost-test-mysql-replica -e "select 1" -ss)" != "1" ] ; then
     echo "Cannot verify gh-ost-test-mysql-replica"
diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests
index c312aa9..ab8c689 100755
--- a/script/cibuild-gh-ost-replica-tests
+++ b/script/cibuild-gh-ost-replica-tests
@@ -44,11 +44,9 @@ test_mysql_version() {
 
   sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
   echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
-  cat gh-ost-ci-env/bin/gh-ost-test-mysql-master
 
   sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-replica
   echo 'sandboxes/rsandbox/s1 "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-replica
-  cat gh-ost-ci-env/bin/gh-ost-test-mysql-replica
 
   export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}"