Update tests to reflect new style profile configuration

This commit is contained in:
Michael Boelen 2018-01-23 15:00:34 +01:00
parent 18bd61ebec
commit 6192cbd8fa
No known key found for this signature in database
GPG Key ID: 26141F77A09D7F04
2 changed files with 3 additions and 3 deletions

View File

@ -92,11 +92,11 @@
# Description : Scan home directories for specific files, used in different tests later # Description : Scan home directories for specific files, used in different tests later
# Notes : For performance reasons we combine the scanning of different files, so inode caching is used # Notes : For performance reasons we combine the scanning of different files, so inode caching is used
# as much as possible for every find command # as much as possible for every find command
# Profile opt : ignore_home_dir (multiple lines allowed), ignores home directory # Profile opt : ignore-home-dir (multiple lines allowed), ignores home directory
if [ ! -z "${REPORTFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi if [ ! -z "${REPORTFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
Register --test-no HOME-9350 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Collecting information from home directories" Register --test-no HOME-9350 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Collecting information from home directories"
if [ ${SKIPTEST} -eq 0 ]; then if [ ${SKIPTEST} -eq 0 ]; then
IGNORE_HOME_DIRS=$(${GREPBINARY} "^config:ignore_home_dir:" ${PROFILE} | ${AWKBINARY} -F: '{ print $3 }') IGNORE_HOME_DIRS=$(${GREPBINARY} "^ignore-home-dir[]=" ${REPORTFILE} | ${AWKBINARY} -F= '{ print $2 }')
if [ -z "${IGNORE_HOME_DIRS}" ]; then if [ -z "${IGNORE_HOME_DIRS}" ]; then
LogText "Result: IGNORE_HOME_DIRS empty, no paths excluded" LogText "Result: IGNORE_HOME_DIRS empty, no paths excluded"
else else

View File

@ -259,7 +259,7 @@
else else
for ITEM in ${FIND}; do for ITEM in ${FIND}; do
LogText "Found stratum 16 peer: ${ITEM}" LogText "Found stratum 16 peer: ${ITEM}"
FIND2=$(${EGREPBINARY} "^ntp:ignore_stratum_16_peer:${ITEM}:" ${PROFILE}) FIND2=$(${EGREPBINARY} "^ntp-ignore-stratum-16-peer=${ITEM}" ${PROFILE})
if IsEmpty "${FIND2}"; then if IsEmpty "${FIND2}"; then
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
Report "ntp_stratum_16_peer[]=${ITEM}" Report "ntp_stratum_16_peer[]=${ITEM}"