From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Thu, 8 Dec 2016 20:30:07 +0000 (+0000)
Subject: Merge "Introducing common functions"
X-Git-Tag: danube.1.RC1~40
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=doctor.git;a=commitdiff_plain;h=e1df30c97affb902f651b31910e2aff2e1874bc5

Merge "Introducing common functions"
---

e1df30c97affb902f651b31910e2aff2e1874bc5
diff --cc tests/run.sh
index 093d4e8c,3c4afc1b..ea7ded50
--- a/tests/run.sh
+++ b/tests/run.sh
@@@ -489,11 -475,10 +475,10 @@@ END_TX
  }
  
  calculate_notification_time() {
 -    detected=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
 -    notified=$(grep "doctor consumer notified at" consumer.log | awk '{print $5}')
 +    detected=$(grep "doctor monitor detected at" monitor.log | awk '{print $10}')
 +    notified=$(grep "doctor consumer notified at" consumer.log | awk '{print $10}')
      if ! grep -q "doctor consumer notified at" consumer.log ; then
-         echo "ERROR: consumer hasn't received fault notification."
-         exit 1
+         die $LINENO "Consumer hasn't received fault notification."
      fi
      echo "$notified $detected" | \
          awk '{