Merge "Adding python package requirement for VNF testing."

[yardstick.git] / tests / unit / api / utils / test_influx.py

diff --git a/tests/unit/api/utils/test_influx.py b/tests/unit/api/utils/test_influx.py
index 0852da2..aff0cab 100644 (file)
--- a/tests/unit/api/utils/test_influx.py
+++ b/tests/unit/api/utils/test_influx.py
@@ -6,19 +6,23 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+from __future__ import absolute_import
 import unittest
 import mock
-import uuid
-import datetime
 
 from api.utils import influx
 
+import six.moves.configparser as ConfigParser
+
 
 class GetDataDbClientTestCase(unittest.TestCase):
 
     @mock.patch('api.utils.influx.ConfigParser')
     def test_get_data_db_client_dispatcher_not_influxdb(self, mock_parser):
         mock_parser.ConfigParser().get.return_value = 'file'
+        # reset exception to avoid
+        # TypeError: catching classes that do not inherit from BaseException
+        mock_parser.NoOptionError = ConfigParser.NoOptionError
         try:
             influx.get_data_db_client()
         except Exception as e:
@@ -35,38 +39,14 @@ class GetIpTestCase(unittest.TestCase):
         self.assertEqual(result, output)
 
 
-class WriteDataTestCase(unittest.TestCase):
-
-    @mock.patch('api.utils.influx.get_data_db_client')
-    def test_write_data(self, mock_get_client):
-        measurement = 'tasklist'
-        field = {'status': 1}
-        timestamp = datetime.datetime.now()
-        tags = {'task_id': str(uuid.uuid4())}
-
-        influx._write_data(measurement, field, timestamp, tags)
-        mock_get_client.assert_called_with()
-
-
-class WriteDataTasklistTestCase(unittest.TestCase):
-
-    @mock.patch('api.utils.influx._write_data')
-    def test_write_data_tasklist(self, mock_write_data):
-        task_id = str(uuid.uuid4())
-        timestamp = datetime.datetime.now()
-        status = 1
-        influx.write_data_tasklist(task_id, timestamp, status)
-
-        field = {'status': status, 'error': ''}
-        tags = {'task_id': task_id}
-        mock_write_data.assert_called_with('tasklist', field, timestamp, tags)
-
-
 class QueryTestCase(unittest.TestCase):
 
     @mock.patch('api.utils.influx.ConfigParser')
     def test_query_dispatcher_not_influxdb(self, mock_parser):
         mock_parser.ConfigParser().get.return_value = 'file'
+        # reset exception to avoid
+        # TypeError: catching classes that do not inherit from BaseException
+        mock_parser.NoOptionError = ConfigParser.NoOptionError
         try:
             sql = 'select * form tasklist'
             influx.query(sql)