Fix test failure condition 71/60171/2
authorToshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
Wed, 25 Jul 2018 09:40:31 +0000 (09:40 +0000)
committerToshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
Fri, 27 Jul 2018 09:52:39 +0000 (09:52 +0000)
* 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>
baro_tests/collectd.py

index 2723d32..922403f 100644 (file)
@@ -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