fix git conflict

pingcap · Jul 12, 2022 · d2d2c47 · d2d2c47
1 parent f2422b8
commit d2d2c47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -281,11 +281,7 @@ dm_unit_test: check_failpoint_ctl
 	mkdir -p $(DM_TEST_DIR)
 	$(FAILPOINT_ENABLE)
 	@export log_level=error; \
-<<<<<<< HEAD
-	$(GOTEST) -timeout 5m -covermode=atomic -coverprofile="$(DM_TEST_DIR)/cov.unit_test.out" $(DM_PACKAGES) \
-=======
-	$(GOTEST) -timeout 10m -covermode=atomic -coverprofile="$(DM_TEST_DIR)/cov.unit_test.out" $(1) \
->>>>>>> 65e67fc4b (test(dm): fix unstable tests (#5865))
+	$(GOTEST) -timeout 10m -covermode=atomic -coverprofile="$(DM_TEST_DIR)/cov.unit_test.out" $(DM_PACKAGES) \
 	|| { $(FAILPOINT_DISABLE); exit 1; }
 	$(FAILPOINT_DISABLE)
 

diff --git a/dm/tests/_utils/wait_process_exit b/dm/tests/_utils/wait_process_exit
@@ -4,7 +4,7 @@
 process=$1
 
 WAIT_COUNT=0
-while [ $WAIT_COUNT -lt 30 ]; do
+while [ $WAIT_COUNT -lt 120 ]; do
 	pgrep $process >/dev/null 2>&1
 	ret=$?
 	if [ "$ret" != "0" ]; then
@@ -16,9 +16,5 @@ while [ $WAIT_COUNT -lt 30 ]; do
 	((WAIT_COUNT++))
 done
 
-<<<<<<< HEAD
-echo "process $process didn't exit after 30 seconds"
-=======
 echo "process $process didn't exit after 120 seconds, current processlist: $(ps aux | grep $process | grep -v 'grep')"
->>>>>>> 65e67fc4b (test(dm): fix unstable tests (#5865))
 exit 1