From: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Wed, 11 Sep 2019 04:08:16 +0000 (+0900)
Subject: Fix 028.watchdog_enable_consensus_with_half_votes test script.
X-Git-Tag: V4_2_0_ALPHA1~292
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=83decaa0f9a56718ba65728f87344b29b64d2689;p=pgpool2.git

Fix 028.watchdog_enable_consensus_with_half_votes test script.

pcp_watchdog_node needs to have -h option to point to UNIX socket
directory if it is not the standard (/tmp) place.
---

diff --git a/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh b/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
index e508e01ce..8116e4fa7 100755
--- a/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
+++ b/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
@@ -34,12 +34,12 @@ function wait_for_watchdog_startup
 # retun 0 if quorum exists.
 function quorum_exists
 {
-    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -p $PCP_PORT >/dev/null 2>&1
+    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -h $PGSOCKET_DIR -p $PCP_PORT >/dev/null 2>&1
     if [ $? != 0 ];then
 	echo "pcp_watchdog_info is not still available"
 	for i in 1 2 3 4 5
 	do
-	    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -p $PCP_PORT >/dev/null 2>&1
+	    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -h $PGSOCKET_DIR -p $PCP_PORT >/dev/null 2>&1
 	    if [ $? = 0 ];then
 		break;
 	    fi
@@ -48,7 +48,7 @@ function quorum_exists
 	done
     fi
 
-    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -p $PCP_PORT |grep QUORUM|egrep 'EXIST|EDGE'>/dev/null
+    $PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -h $PGSOCKET_DIR -p $PCP_PORT |grep QUORUM|egrep 'EXIST|EDGE'>/dev/null
 }
 
 # shutdown half of nodes for even total number of nodes.