From 9cb128461d6c80aed690a1be0629ab0686e9fa1a Mon Sep 17 00:00:00 2001 From: Ramil Valitov Date: Mon, 29 Jun 2020 01:49:57 +0300 Subject: [PATCH] [fix] pools check --- tests/all.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/all.sh b/tests/all.sh index fb22e12..4f4ec8f 100644 --- a/tests/all.sh +++ b/tests/all.sh @@ -159,16 +159,14 @@ testZabbixDiscoverSimilarSocketPoolNames() { DATA=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"]) NUMBER_OF_POOLS=$(echo "$DATA" | grep -o -F '{"{#POOLNAME}":"socket1",' | wc -l) PHP_COUNT=$(getNumberOfPHPVersions) - POOLS=$(echo "($PHP_COUNT * $MAX_POOLS)/1" | bc) - assertEquals "Found $NUMBER_OF_POOLS pools instead of $POOLS" "$NUMBER_OF_POOLS" "$POOLS" + assertEquals "Number of pools mismatch" "$PHP_COUNT" "$NUMBER_OF_POOLS" } testZabbixDiscoverSimilarHttpPoolNames() { DATA=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"]) NUMBER_OF_POOLS=$(echo "$DATA" | grep -o -F '{"{#POOLNAME}":"http1",' | wc -l) PHP_COUNT=$(getNumberOfPHPVersions) - POOLS=$(echo "($PHP_COUNT * $MAX_POOLS)/1" | bc) - assertEquals "Found $NUMBER_OF_POOLS pools instead of $POOLS" "$NUMBER_OF_POOLS" "$POOLS" + assertEquals "Number of pools mismatch" "$PHP_COUNT" "$NUMBER_OF_POOLS" } # Load shUnit2.