Merge "Move tests: unit/dispatcher"

3 files changed, 3 insertions, 9 deletions

diff --git a/tests/unit/dispatcher/__init__.py b/yardstick/tests/unit/dispatcher/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/unit/dispatcher/__init__.py
+++ b/yardstick/tests/unit/dispatcher/__init__.py
diff --git a/tests/unit/dispatcher/test_influxdb.py b/yardstick/tests/unit/dispatcher/test_influxdb.py
index 7ebe8c90b..bca94e385 100644
--- a/tests/unit/dispatcher/test_influxdb.py
+++ b/yardstick/tests/unit/dispatcher/test_influxdb.py
@@ -11,20 +11,15 @@
 
 # Unittest for yardstick.dispatcher.influxdb
 
-from __future__ import absolute_import
+import mock
 import unittest
 
+from yardstick.dispatcher.influxdb import InfluxdbDispatcher
+from yardstick import _init_logging
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 
-from yardstick import _init_logging
 _init_logging()
 
-from yardstick.dispatcher.influxdb import InfluxdbDispatcher
-
 
 class InfluxdbDispatcherTestCase(unittest.TestCase):
 
diff --git a/tests/unit/dispatcher/test_influxdb_line_protocol.py b/yardstick/tests/unit/dispatcher/test_influxdb_line_protocol.py
index 51dc39e3c..641e97fae 100644
--- a/tests/unit/dispatcher/test_influxdb_line_protocol.py
+++ b/yardstick/tests/unit/dispatcher/test_influxdb_line_protocol.py
@@ -11,7 +11,6 @@
 # yardstick comment: this file is a modified copy of
 # influxdb-python/influxdb/tests/test_line_protocol.py
 
-from __future__ import absolute_import
 import unittest
 from third_party.influxdb.influxdb_line_protocol import make_lines