From f50595d4e2fbf418785f71a1bcb4f0288140b0d0 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Thu, 13 Nov 2014 00:57:36 +0100
Subject: [PATCH] Show only unique files for deleted files [LOGG-2190]

---
 include/tests_logging | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/tests_logging b/include/tests_logging
index ad07ea4c..e227440a 100644
--- a/include/tests_logging
+++ b/include/tests_logging
@@ -33,7 +33,6 @@
 #
 #################################################################################
 #
-
     InsertSection "Logging and files"
 
     # Test        : LOGG-2130
@@ -230,7 +229,6 @@
           else
             Display --indent 2 --text "- Checking logrotate presence" --result WARNING --color RED
             logtext "Result: No logrotate configuration found"
-            ReportWarning ${TEST_NO} "L" "No logrotate configuration has been found"
             ReportSuggestion ${TEST_NO} "Check if files are properly rotated by a some tool instead of logrotate"
         fi
     fi
@@ -357,7 +355,7 @@
     Register --test-no LOGG-2160 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking /etc/newsyslog.conf"
     if [ ${SKIPTEST} -eq 0 ]; then
         logtext "Result: /etc/newsyslog.conf found"
-        Display --indent 2 --text "- Checking /etc/newsyslog.conf" --result FOUND --color GREEN	
+        Display --indent 2 --text "- Checking /etc/newsyslog.conf" --result FOUND --color GREEN
         LOGROTATE_CONFIG_FOUND=1
         LOGROTATE_TOOL="newsyslog"
     fi
@@ -379,7 +377,7 @@
                 logtext "Result: Item ${I} is not a directory"
             fi
         done
-        Display --indent 4 --text "- Checking log directories (newsyslog.conf)" --result DONE --color GREEN	
+        Display --indent 4 --text "- Checking log directories (newsyslog.conf)" --result DONE --color GREEN
     fi
 #
 #################################################################################
@@ -398,7 +396,7 @@
                 logtext "Result: Item ${I} is not a file"
             fi
         done
-        Display --indent 4 --text "- Checking log files (newsyslog.conf)" --result DONE --color GREEN	
+        Display --indent 4 --text "- Checking log files (newsyslog.conf)" --result DONE --color GREEN
     fi
 #
 #################################################################################
@@ -416,7 +414,7 @@
                 logtext "Result: directory ${I} can't be found"
             fi
         done
-        Display --indent 2 --text "- Checking log directories (static list)" --result DONE --color GREEN	
+        Display --indent 2 --text "- Checking log directories (static list)" --result DONE --color GREEN
     fi
 #
 #################################################################################
@@ -448,7 +446,7 @@
     Register --test-no LOGG-2190 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking deleted files in file table"
     if [ ${SKIPTEST} -eq 0 ]; then
         logtext "Test: checking deleted files but are still in use"
-        FIND=`${LSOFBINARY} -n +L 1 2>&1 | egrep -v "WARNING|Output information" | awk '{ if ($5=="REG") { print $10 } }' | grep -v "^$"`
+        FIND=`${LSOFBINARY} -n +L 1 2>&1 | egrep -v "WARNING|Output information" | awk '{ if ($5=="REG") { print $10 } }' | grep -v "^$" | sort | uniq`
         if [ ! "${FIND}" = "" ]; then
             logtext "Result: found one or more files which are deleted, but still in use"
             for I in ${FIND}; do