diff options
| author |   Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-06-28 16:16:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-28 16:16:29 +0000 |
| commit | 70ea01b882a5ff61a36f8927d64d1bf3b9446838 (patch) | |
| tree | b9dad4cae41701281d22a46e5d8b4a74ec13f0c3 /yardstick | |
| parent | 441d5f55a6e2e155d01d4b396678d0d09bfb8413 (diff) | |
| parent | bb31e6c8221b854041a668ddca438444fe97d212 (diff) | |
Merge "Stop running tests from tests/unit" into stable/fraser
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py | 14 | ||||
| -rw-r--r-- | yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_ixload.py | 4 |
2 files changed, 6 insertions, 12 deletions
diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py index d29642a13..82376a4eb 100644 --- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py +++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py @@ -18,19 +18,13 @@ import os import unittest import mock -from tests.unit import STL_MOCKS from yardstick.tests.unit.network_services.vnf_generic.vnf.test_base import mock_ssh from yardstick.common import utils -STLClient = mock.MagicMock() -stl_patch = mock.patch.dict("sys.modules", STL_MOCKS) -stl_patch.start() - -if stl_patch: - from yardstick.network_services.vnf_generic.vnf.cgnapt_vnf import CgnaptApproxVnf, \ - CgnaptApproxSetupEnvHelper - from yardstick.network_services.vnf_generic.vnf import cgnapt_vnf - from yardstick.network_services.nfvi.resource import ResourceProfile +from yardstick.network_services.vnf_generic.vnf.cgnapt_vnf import CgnaptApproxVnf, \ + CgnaptApproxSetupEnvHelper +from yardstick.network_services.vnf_generic.vnf import cgnapt_vnf +from yardstick.network_services.nfvi.resource import ResourceProfile TEST_FILE_YAML = 'nsb_test_case.yaml' SSH_HELPER = 'yardstick.network_services.vnf_generic.vnf.sample_vnf.VnfSshHelper' diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_ixload.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_ixload.py index 5bebbbf94..59594a3c3 100644 --- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_ixload.py +++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_ixload.py @@ -16,12 +16,12 @@ import subprocess import mock -import unittest import six +import unittest -from yardstick.tests import STL_MOCKS from yardstick import ssh from yardstick.common import utils +from yardstick.tests import STL_MOCKS STLClient = mock.MagicMock() |