pgpool2.git / summary / log / commit / refs

commit    6cabeae0b2101cac59e59f9be8934fe0e13283ae
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Wed Jun 20 02:49:45 2018 +0000

    Fix 006.memqcache test.
    
    It forgot to execute shutdownall if some of tests failed. This lead to
    hang up of subsequent tests.


 src/test/regression/tests/006.memqcache/test.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/regression/tests/006.memqcache/test.sh b/src/test/regression/tests/006.memqcache/test.sh
index 9b213745f..7f81e1f67 100755
--- a/src/test/regression/tests/006.memqcache/test.sh
+++ b/src/test/regression/tests/006.memqcache/test.sh
@@ -54,11 +54,16 @@ SELECT * FROM white_v;
 SELECT * FROM white_v;
 EOF
 
-	grep "fetched from cache" log/pgpool.log | grep t1 > /dev/null || exit 1
-	grep "fetched from cache" log/pgpool.log | grep black_t > /dev/null && exit 1
-	grep "fetched from cache" log/pgpool.log | grep normal_v > /dev/null && exit 1
-	grep "fetched from cache" log/pgpool.log | grep white_v > /dev/null || exit 1
-
+	success=true
+	grep "fetched from cache" log/pgpool.log | grep t1 > /dev/null || success=false
+	grep "fetched from cache" log/pgpool.log | grep black_t > /dev/null && success=false
+	grep "fetched from cache" log/pgpool.log | grep normal_v > /dev/null && success=false
+	grep "fetched from cache" log/pgpool.log | grep white_v > /dev/null || success=false
+	if [ $success = false ];then
+		./shutdownall
+		exit 1
+	fi
+	    
 	java jdbctest > result.txt 2>&1
 	cmp ../expected.txt result.txt
 	if [ $? != 0 ];then


[parent: 514e6fc66cce]