From a7845b674814880c8f928d88d7888c8945197be0 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 5 Mar 2018 11:43:33 +0100
Subject: [PATCH] [NAME-4402] Enhanced test to filter out empty lines
---
include/tests_nameservices | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/tests_nameservices b/include/tests_nameservices
index 132f4e14..2a36062d 100644
--- a/include/tests_nameservices
+++ b/include/tests_nameservices
@@ -573,19 +573,19 @@
if [ ${SKIPTEST} -eq 0 ]; then
LogText "Test: check duplicate line in ${ROOTDIR}etc/hosts"
if [ -f ${ROOTDIR}etc/hosts ]; then
- sFIND=$(${EGREPBINARY} -v '^(#|$)' ${ROOTDIR}etc/hosts | ${AWKBINARY} '{ print $1, $2 }' | ${SORTBINARY} | ${UNIQBINARY} -d)
- if [ "${sFIND}" = "" ]; then
+ OUTPUT=$(${AWKBINARY} '{ print $1, $2 }' ${ROOTDIR}etc/hosts | ${EGREPBINARY} -v '^(#|$)' | ${EGREPBINARY} "[a-f0-9]" | ${SORTBINARY} | ${UNIQBINARY} -d)
+ if [ -z "${OUTPUT}" ]; then
LogText "Result: OK, no duplicate lines found"
Display --indent 4 --text "- Checking ${ROOTDIR}etc/hosts (duplicates)" --result "${STATUS_OK}" --color GREEN
else
- LogText "Found duplicate line: ${sFIND}"
+ LogText "Found duplicate line: ${OUTPUT}"
LogText "Result: found duplicate line"
Display --indent 4 --text "- Checking ${ROOTDIR}etc/hosts (duplicates)" --result "${STATUS_SUGGESTION}" --color YELLOW
ReportSuggestion "${TEST_NO}" "Remove duplicate lines in ${ROOTDIR}etc/hosts"
fi
else
- LogText "Result: ${ROOTDIR}etc/hosts not found, test skipped"
- Display --indent 4 --text "Searching duplicate line" --result "${STATUS_SKIPPED}" --color YELLOW
+ LogText "Result: ${ROOTDIR}etc/hosts not found, test skipped"
+ Display --indent 4 --text "Searching duplicate line" --result "${STATUS_SKIPPED}" --color YELLOW
fi
fi
#