diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-06-25 15:08:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-25 15:08:31 +0000 |
| commit | d2c984e806eac4c981eec95626884c48eb699299 (patch) | |
| tree | f932c92c6899f742cfef99fe8626c394e1a3020f | |
| parent | ab5bb7fab516b88a668e9450fbd5ef086bfc06fc (diff) | |
| parent | c06b5efb34c6cc73483fd3d527e16c34e330efb9 (diff) | |
Merge "Move tests: unit/network_services/nfvi" into stable/fraser
| -rw-r--r-- | yardstick/tests/unit/network_services/nfvi/__init__.py (renamed from tests/unit/network_services/nfvi/__init__.py) | 0 | ||||
| -rw-r--r-- | yardstick/tests/unit/network_services/nfvi/test_collectd.py (renamed from tests/unit/network_services/nfvi/test_collectd.py) | 1 | ||||
| -rw-r--r-- | yardstick/tests/unit/network_services/nfvi/test_resource.py (renamed from tests/unit/network_services/nfvi/test_resource.py) | 0 |
3 files changed, 0 insertions, 1 deletions
diff --git a/tests/unit/network_services/nfvi/__init__.py b/yardstick/tests/unit/network_services/nfvi/__init__.py index e69de29bb..e69de29bb 100644 --- a/tests/unit/network_services/nfvi/__init__.py +++ b/yardstick/tests/unit/network_services/nfvi/__init__.py diff --git a/tests/unit/network_services/nfvi/test_collectd.py b/yardstick/tests/unit/network_services/nfvi/test_collectd.py index 0ae175624..fe59aecfb 100644 --- a/tests/unit/network_services/nfvi/test_collectd.py +++ b/yardstick/tests/unit/network_services/nfvi/test_collectd.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import import unittest import multiprocessing import mock diff --git a/tests/unit/network_services/nfvi/test_resource.py b/yardstick/tests/unit/network_services/nfvi/test_resource.py index 741f9a6cc..741f9a6cc 100644 --- a/tests/unit/network_services/nfvi/test_resource.py +++ b/yardstick/tests/unit/network_services/nfvi/test_resource.py |