From: Emma Foley <emma.l.foley@intel.com>
Date: Wed, 29 Nov 2017 23:35:05 +0000 (+0000)
Subject: Move tests: unit/dispatcher
X-Git-Tag: opnfv-6.0.0~201^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F48265%2F5;p=yardstick.git

Move tests: unit/dispatcher

* Fix pylint errors
* Add TODOs

Some errors are ignored locally, as they were a symptom of other problems.
These issues have been flagged with a TODO, and should be fixed later.

JIRA: YARDSTICK-837
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Change-Id: I1f8a6041424c4c69f46ef30bd5c66d2d51d24347
---

diff --git a/tests/unit/dispatcher/__init__.py b/yardstick/tests/unit/dispatcher/__init__.py
similarity index 100%
rename from tests/unit/dispatcher/__init__.py
rename to yardstick/tests/unit/dispatcher/__init__.py
diff --git a/tests/unit/dispatcher/test_influxdb.py b/yardstick/tests/unit/dispatcher/test_influxdb.py
similarity index 97%
rename from tests/unit/dispatcher/test_influxdb.py
rename to 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
similarity index 98%
rename from tests/unit/dispatcher/test_influxdb_line_protocol.py
rename to 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