aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/network_services/vnf_generic
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-15 05:01:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-15 05:01:02 +0000
commite148db9421cf04eec7ea117e7c91c27092b2f2bc (patch)
treed2c2a48c1afce67c3102703ed1de35d52d9b05ee /tests/unit/network_services/vnf_generic
parent88a06c612e3321c3e8773c0791396b391a867e6c (diff)
parent9f8d8d15c0b2960ca41df1ef3387a50d899a4f9d (diff)
Merge "ACL: remove failing testing"
Diffstat (limited to 'tests/unit/network_services/vnf_generic')
-rw-r--r--tests/unit/network_services/vnf_generic/vnf/test_acl_vnf.py24
1 files changed, 0 insertions, 24 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_acl_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_acl_vnf.py
index c079a2ad0..a63a59d48 100644
--- a/tests/unit/network_services/vnf_generic/vnf/test_acl_vnf.py
+++ b/tests/unit/network_services/vnf_generic/vnf/test_acl_vnf.py
@@ -87,7 +87,6 @@ stl_patch.start()
if stl_patch:
from yardstick.network_services.vnf_generic.vnf.acl_vnf import AclApproxVnf
- from yardstick.network_services.vnf_generic.vnf import acl_vnf
from yardstick.network_services.nfvi.resource import ResourceProfile
@@ -404,29 +403,6 @@ class TestAclApproxVnf(unittest.TestCase):
self.assertIsNone(acl_approx_vnf.instantiate(self.scenario_cfg,
self.context_cfg))
- def test_instantiate_panic(self, mock_process):
- with mock.patch("yardstick.ssh.SSH") as ssh:
- ssh_mock = mock.Mock(autospec=ssh.SSH)
- ssh_mock.execute = mock.Mock(return_value=(1, "", ""))
- ssh.from_node.return_value = ssh_mock
- vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
- acl_approx_vnf = AclApproxVnf(name, vnfd)
- self.scenario_cfg['vnf_options'] = {'acl': {'cfg': "",
- 'rules': ""}}
- acl_approx_vnf._run_acl = mock.Mock(return_value=0)
- acl_approx_vnf.WAIT_TIME = 0
- acl_approx_vnf.resource_helper = mock.MagicMock()
- acl_approx_vnf._build_config = mock.MagicMock()
- acl_approx_vnf._vnf_process = mock.MagicMock()
- acl_approx_vnf._vnf_process.start = mock.Mock()
- acl_approx_vnf._vnf_process.is_alive = mock.Mock(return_value=True)
- self.assertRaises(ValueError, acl_approx_vnf.instantiate,
- self.scenario_cfg, self.context_cfg)
- acl_approx_vnf.q_out.put("PANIC")
- acl_approx_vnf.WAIT_TIME = 0
- self.assertRaises(ValueError, acl_approx_vnf.instantiate,
- self.scenario_cfg, self.context_cfg)
-
def test_scale(self, mock_process):
vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
acl_approx_vnf = AclApproxVnf(name, vnfd)