From 151b455f841b89e026427ce967fb1a0864e36cb9 Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Tue, 20 Oct 2020 11:14:33 -0700 Subject: Move test inside if block to prevent premature exit grep returns a non-zero error code if the pattern is not found. This would cause the topology-manager.sh test to exit prematurely instead of capturing and logging the error and returning zero as intended. Issue-ID: MULTICLOUD-1240 Signed-off-by: Todd Malsbary Change-Id: I29c4d30630c0f803325c2ed024d4c0b9e8a0e911 --- kud/tests/topology-manager.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kud/tests/topology-manager.sh b/kud/tests/topology-manager.sh index bbffd4d7..7d434386 100755 --- a/kud/tests/topology-manager.sh +++ b/kud/tests/topology-manager.sh @@ -15,9 +15,8 @@ set -o pipefail source _common.sh source _functions.sh -ethernet_adpator_version=$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 ) -if [ -z "$ethernet_adpator_version" ]; then - echo " Ethernet adapator version is not set. Topology manager test case cannot run on this machine" +if [ -z "$( lspci | grep "Ethernet Controller XL710" | head -n 1 | cut -d " " -f 8 )" ]; then + echo "Ethernet adaptor version is not set. Topology manager test case cannot run on this machine" exit 0 else echo "NIC card specs match. Topology manager option avaiable for this version." -- cgit 1.2.3-korg