From 135aec31d2e8efaf11d42830c6b8f8018e3020d1 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Sep 16 2012 17:55:21 +0000
Subject: modified the tcpdump-test on eth0 to better reflect the qa-harness testenvironment and other environments. Inside QA the test will fail at wrong results, outside of QA the test will always succeed and only report results.


---

diff --git a/tests/p_tcpdump/tcpdump_eth0.sh b/tests/p_tcpdump/tcpdump_eth0.sh
index a091231..c412651 100755
--- a/tests/p_tcpdump/tcpdump_eth0.sh
+++ b/tests/p_tcpdump/tcpdump_eth0.sh
@@ -22,14 +22,27 @@ if [[ $IP =~ $regex ]]
   sleep 1
   # reading from file, for each ping we should see two pakets
   WORKING=$( tcpdump -r $FILE | grep -ci icmp )
-  # The script will allways work, but if the log does not contain
-  # what we expect, we will log it
-  if [ $WORKING == $[COUNT*2] ]
+  if [ $SKIP_QA_HARNESS ]
     then
+    # treat qa-harness and non qa-harness differently,
+    # the script will always succeed outside qa, but will log results
     ret_val=0
+    if [ $WORKING != $[COUNT*2] ]
+      then
+      t_Log "ping to Default-Gateway did not return the number of pakets we expect. "$WORKING" of "$[COUNT*2]" pakets were dumped to file"
+    else
+      t_Log "ping to Default-Gateway looks OK. "$WORKING" of "$[COUNT*2]" pakets were dumped to file"
+    fi
   else
-    t_Log "ping to Default-Gateway droped pakets!! Only "$WORKING" of "$[COUNT*2]" entries were found!!"
-    ret_val=1
+    # in qa-harness, which is a controlled environment, the script will fail at odd results
+    if [ $WORKING == $[COUNT*2] ]
+      then
+      t_Log "QA-harness: ping to Default-Gateway looks OK. "$WORKING" of "$[COUNT*2]" pakets were dumped to file"
+      ret_val=0
+    else
+      t_Log "QA-harness: ping to Default-Gateway droped pakets!! Only "$WORKING" of "$[COUNT*2]" entries were found!!"
+      ret_val=1
+    fi
   fi
 else
   t_Log "No Default-GW found - skiping test"