diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-08-24 14:23:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-24 14:23:39 +0000 |
| commit | 1da439765b20bbc9a1f63d736f4c6284b654d50d (patch) | |
| tree | 0a21706812bd6ca0161c4dc2fc2d8ecc76383029 /functest/tests/unit/openstack | |
| parent | 671b3356e8fc7c6219919f978a3dee6b69e8c663 (diff) | |
| parent | b58e9f7b713e53b70b45ca3d13c0fcf0ed93e801 (diff) | |
Merge "Added means to override the RC file credentials."
Diffstat (limited to 'functest/tests/unit/openstack')
| -rw-r--r-- | functest/tests/unit/openstack/vping/test_vping.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/functest/tests/unit/openstack/vping/test_vping.py b/functest/tests/unit/openstack/vping/test_vping.py index b229c351..a28c61ae 100644 --- a/functest/tests/unit/openstack/vping/test_vping.py +++ b/functest/tests/unit/openstack/vping/test_vping.py @@ -50,8 +50,6 @@ class VPingUserdataTesting(unittest.TestCase): 'vm_active', return_value=True) def test_vping_userdata(self, deploy_vm, path_exists, create_flavor, get_port_ip, vm_active): - os_vm_inst = mock.MagicMock(name='get_console_output') - os_vm_inst.get_console_output.return_value = 'vPing OK' with mock.patch('snaps.openstack.utils.deploy_utils.create_image', return_value=OpenStackImage(self.os_creds, None)), \ mock.patch('snaps.openstack.utils.deploy_utils.create_network', @@ -67,8 +65,8 @@ class VPingUserdataTesting(unittest.TestCase): name='foo', network_name='bar')]), None)), \ mock.patch('snaps.openstack.create_instance.' - 'OpenStackVmInstance.get_os_vm_server_obj', - return_value=os_vm_inst): + 'OpenStackVmInstance.get_console_output', + return_value='vPing OK'): self.assertEquals(TestCase.EX_OK, self.vping_userdata.run()) |