X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Funit%2Fdispatcher%2Ftest_influxdb.py;h=7ebe8c90b2b62c7213c4fc68c1f100995262ddee;hb=468aeaf9fe6a5cd0d350f566ed7b9216efc752b6;hp=0c7b58135b8d6eeb7b052b78fb28397846b80343;hpb=270d6092c809e8de039a08efd8c108f865cf860e;p=yardstick.git

diff --git a/tests/unit/dispatcher/test_influxdb.py b/tests/unit/dispatcher/test_influxdb.py
index 0c7b58135..7ebe8c90b 100644
--- a/tests/unit/dispatcher/test_influxdb.py
+++ b/tests/unit/dispatcher/test_influxdb.py
@@ -14,11 +14,15 @@
 from __future__ import absolute_import
 import unittest
 
+
 try:
     from unittest import mock
 except ImportError:
     import mock
 
+from yardstick import _init_logging
+_init_logging()
+
 from yardstick.dispatcher.influxdb import InfluxdbDispatcher
 
 
@@ -72,65 +76,36 @@ class InfluxdbDispatcherTestCase(unittest.TestCase):
             },
             "runner_id": 8921
         }
-        self.data3 = {
-            "benchmark": {
-                "data": {
-                    "mpstat": {
-                        "cpu0": {
-                            "%sys": "0.00",
-                            "%idle": "99.00"
-                        },
-                        "loadavg": [
-                            "1.09",
-                            "0.29"
-                        ]
-                    },
-                    "rtt": "1.03"
-                }
-            }
-        }
 
-        self.yardstick_conf = {'yardstick': {}}
-
-    def test_record_result_data_no_target(self):
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
-        influxdb.target = ''
-        self.assertEqual(influxdb.record_result_data(self.data1), -1)
-
-    def test_record_result_data_no_case_name(self):
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
-        self.assertEqual(influxdb.record_result_data(self.data2), -1)
+        self.yardstick_conf = {'dispatcher_influxdb': {}}
 
     @mock.patch('yardstick.dispatcher.influxdb.requests')
     def test_record_result_data(self, mock_requests):
         type(mock_requests.post.return_value).status_code = 204
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
-        self.assertEqual(influxdb.record_result_data(self.data1), 0)
-        self.assertEqual(influxdb.record_result_data(self.data2), 0)
-        self.assertEqual(influxdb.flush_result_data(), 0)
-
-    def test__dict_key_flatten(self):
-        line = 'mpstat.loadavg1=0.29,rtt=1.03,mpstat.loadavg0=1.09,' \
-               'mpstat.cpu0.%idle=99.00,mpstat.cpu0.%sys=0.00'
-        # need to sort for assert to work
-        line = ",".join(sorted(line.split(',')))
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
-        flattened_data = influxdb._dict_key_flatten(
-            self.data3['benchmark']['data'])
-        result = ",".join(
-            [k + "=" + v for k, v in sorted(flattened_data.items())])
-        self.assertEqual(result, line)
+        influxdb = InfluxdbDispatcher(self.yardstick_conf)
+        data = {
+            'status': 1,
+            'result': {
+                'criteria': 'PASS',
+                'info': {
+                },
+                'task_id': 'b9e2bbc2-dfd8-410d-8c24-07771e9f7979',
+                'testcases': {
+                }
+            }
+        }
+        self.assertEqual(influxdb.flush_result_data(data), 0)
 
     def test__get_nano_timestamp(self):
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
-        results = {'benchmark': {'timestamp': '1451461248.925574'}}
+        influxdb = InfluxdbDispatcher(self.yardstick_conf)
+        results = {'timestamp': '1451461248.925574'}
         self.assertEqual(influxdb._get_nano_timestamp(results),
                          '1451461248925574144')
 
     @mock.patch('yardstick.dispatcher.influxdb.time')
     def test__get_nano_timestamp_except(self, mock_time):
         results = {}
-        influxdb = InfluxdbDispatcher(None, self.yardstick_conf)
+        influxdb = InfluxdbDispatcher(self.yardstick_conf)
         mock_time.time.return_value = 1451461248.925574
         self.assertEqual(influxdb._get_nano_timestamp(results),
                          '1451461248925574144')