From: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
Date: Wed, 25 Jul 2018 09:40:31 +0000 (+0000)
Subject: Fix test failure condition
X-Git-Tag: opnfv-7.1.0~29
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4c1b6b2ea5cafcb07207ca07eb589fe34a6e5dd5;p=barometer.git

Fix test failure condition

* Because the type of the variable res[3] is bool,
  we should not compare it with a string.
* The expression "or 'None'" is always the same result,
  because 'None' is a constant value.
  It should be included in the comparison.

Change-Id: I25defad98d612d21027218438ca2a28744292cf5
Signed-off-by: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
---

diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 2723d320..922403f1 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -867,7 +867,7 @@ def main(bt_logger=None):
         compute_ids, plugin_labels, aodh_plugin_labels, results, out_plugins)
 
     for res in results:
-        if res[3] is 'False' or 'None':
+        if not res[3]:
             logger.error('Some tests have failed or have not been executed')
             logger.error('Overall Result is Fail')
             return 1