integration test: fix invalid pgrep expression which may cause case f…

…ail sometime; add sleep to all_mode test(may fail sometimes)
pingcap · Sep 22, 2021 · 5d1b29a · 5d1b29a
1 parent 08727bc
commit 5d1b29a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tests/_utils/test_prepare b/tests/_utils/test_prepare
@@ -32,7 +32,7 @@ function wait_pattern_exit() {
     pattern=$1
     while true
     do
-        if [ "pgrep -f $pattern" != "0" ]; then
+        if ! pgrep -f $pattern >/dev/null 2>&1; then
             echo "pattern $pattern already exit"
             return 0
         fi

diff --git a/tests/all_mode/run.sh b/tests/all_mode/run.sh
@@ -400,6 +400,7 @@ function run() {
 		"resume-relay -s mysql-replica-01" \
 		"\"result\": true" 2
 
+	sleep 2
 	# relay should continue pulling from syncer's checkpoint, so only pull the latest binlog
 	server_uuid=$(tail -n 1 $WORK_DIR/worker1/relay_log/server-uuid.index)
 	echo "relay logs $(ls $WORK_DIR/worker1/relay_log/$server_uuid)"