diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-10-03 22:00:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-03 22:00:55 +0000 |
| commit | add9dfa6f8739ec3328388c2658750e185e6a3ed (patch) | |
| tree | ef6770a0b7adf6c3faa899770d3812cf266b1eb7 /tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py | |
| parent | eb5b2735fe9907d38fa8f64df1efbe979158d7ec (diff) | |
| parent | e228c2a3ac5b0173792fa7b11f9540ecec3a0029 (diff) | |
Merge "NSB PROX test hang fixes"
Diffstat (limited to 'tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py')
| -rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py index 3813aaa21..4103d7825 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py @@ -565,8 +565,9 @@ class TestVpeApproxVnf(unittest.TestCase): mock_ssh(ssh) resource = mock.Mock(autospec=ResourceProfile) - resource.check_if_sa_running.return_value = False, 'error' + resource.check_if_sa_running.return_value = 1, '' resource.amqp_collect_nfvi_kpi.return_value = {'foo': 234} + resource.check_if_sa_running.return_value = (1, None) vpe_approx_vnf = VpeApproxVnf(NAME, self.VNFD_0) vpe_approx_vnf.q_in = mock.MagicMock() @@ -588,7 +589,7 @@ class TestVpeApproxVnf(unittest.TestCase): mock_ssh(ssh) resource = mock.Mock(autospec=ResourceProfile) - resource.check_if_sa_running.return_value = True, 'good' + resource.check_if_sa_running.return_value = 0, '1234' resource.amqp_collect_nfvi_kpi.return_value = {'foo': 234} vpe_approx_vnf = VpeApproxVnf(NAME, self.VNFD_0) |