From 9f8d8d15c0b2960ca41df1ef3387a50d899a4f9d Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Mon, 14 Aug 2017 20:21:06 -0700 Subject: ACL: remove failing testing test_instantiate_panic fails randomly sometimes in Jenkins, the test doesn't really do anything useful, so remove it Change-Id: Ia44ebbe778b812ae1b4660d64e88bf029fed3701 Signed-off-by: Ross Brattain --- .../vnf_generic/vnf/test_acl_vnf.py | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'tests/unit/network_services/vnf_generic') 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) -- cgit 1.2.3-korg