summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2020-10-20 11:14:33 -0700
committerTodd Malsbary <todd.malsbary@intel.com>2020-10-30 16:27:03 -0700
commit151b455f841b89e026427ce967fb1a0864e36cb9 (patch)
tree5c23399678b14bc5312a1708f8794dd726398728
parent0c352ef0d74d4b51a0fce5123b34a6753e8ab6a4 (diff)
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 <todd.malsbary@intel.com> Change-Id: I29c4d30630c0f803325c2ed024d4c0b9e8a0e911
-rwxr-xr-xkud/tests/topology-manager.sh5
1 files 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."