Merge "remove failing influx testcases"

[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 e8b4c93..aff0cab 100644 (file)
--- a/tests/unit/api/utils/test_influx.py
+++ b/tests/unit/api/utils/test_influx.py
@@ -6,17 +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
 
 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:
@@ -38,6 +44,9 @@ 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)