summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-01-22 21:47:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-22 21:47:07 +0000
commit847881b9231b4a7713347e8532afdb9cae764518 (patch)
tree44b037c78687c9fa60a318f68aa5275a2b10fb39
parent2396d6de3f6c45d8144c46145f653ef828124f61 (diff)
parentb3cc28d84b949907a89d76c54ece73ed1a69f353 (diff)
Merge "Move tests: unit/dispatcher"
-rw-r--r--yardstick/tests/unit/dispatcher/__init__.py (renamed from tests/unit/dispatcher/__init__.py)0
-rw-r--r--yardstick/tests/unit/dispatcher/test_influxdb.py (renamed from tests/unit/dispatcher/test_influxdb.py)11
-rw-r--r--yardstick/tests/unit/dispatcher/test_influxdb_line_protocol.py (renamed from tests/unit/dispatcher/test_influxdb_line_protocol.py)1
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