Test: fix 038.pcp_commands regression test.

The result of the test showed local host IP. Although the IP can be
either IPv4 or IPv6, the test script hadn't considered it. To fix
this, now test.sh converts IPv4 and IPv6 IP to "localhost".

diff --git a/src/test/regression/tests/038.pcp_commands/expected b/src/test/regression/tests/038.pcp_commands/expected
index 45e459146e4d8b8cb1c2a88f9459571437a87ea8..861fabb87c52ce2003207544b5dbf655747c0d7f 100644 (file)
--- a/src/test/regression/tests/038.pcp_commands/expected
+++ b/src/test/regression/tests/038.pcp_commands/expected
@@ -1,10 +1,10 @@
 CREATE EXTENSION pgpool_adm;
 CREATE EXTENSION
-SELECT database, status, client_host, statement FROM pcp_proc_info
+SELECT database, status, case when client_host = '127.0.0.1' or client_host = '::1' then 'localhost' end, statement FROM pcp_proc_info
 (host => '', port => 11001, username => 't-ishii', password => 't-ishii')
 WHERE connected = '1' AND backend_id = '0' AND statement = 'SELECT pg_sleep(1)'
- database |     status      | client_host |     statement      
-----------+-----------------+-------------+--------------------
- test     | Execute command | 127.0.0.1   | SELECT pg_sleep(1)
+ database |     status      |   case    |     statement      
+----------+-----------------+-----------+--------------------
+ test     | Execute command | localhost | SELECT pg_sleep(1)
 (1 row)
 

diff --git a/src/test/regression/tests/038.pcp_commands/test.sh b/src/test/regression/tests/038.pcp_commands/test.sh
index cb75d4a9d5d1805da38e174ae5c1bc466040f056..21896e44bbc0787077e3c6fd2b83d617e24585f8 100755 (executable)
--- a/src/test/regression/tests/038.pcp_commands/test.sh
+++ b/src/test/regression/tests/038.pcp_commands/test.sh
@@ -60,7 +60,7 @@ wait_for_pgpool_startup
 $PSQL -a -h localhost -c "SELECT pg_sleep(1)" test &
 $PSQL -a -h localhost test > result 2>&1 <<EOF
 CREATE EXTENSION pgpool_adm;
-SELECT database, status, client_host, statement FROM pcp_proc_info
+SELECT database, status, case when client_host = '127.0.0.1' or client_host = '::1' then 'localhost' end, statement FROM pcp_proc_info
 (host => '', port => $PCP_PORT, username => '$WHOAMI', password => '$WHOAMI')
 WHERE connected = '1' AND backend_id = '0' AND statement = 'SELECT pg_sleep(1)'
 EOF