apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup merge mistakes

Browse Source
This commit is contained in:
John Burwell 2016-11-17 00:09:56 -05:00
parent c66cf1c60d
commit 5cc9070b0b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
View File

@ -30,8 +30,6 @@ import static org.mockito.Mockito.times;
import java.util.ArrayList; import java.util.ArrayList;
import static org.powermock.api.mockito.PowerMockito.whenNew; import static org.powermock.api.mockito.PowerMockito.whenNew;
import static org.powermock.api.mockito.PowerMockito.whenNew;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
@ -341,12 +339,6 @@ public class VmwareResourceTest {
_resource.findVmOnDatacenter(context, hyperHost, volume); _resource.findVmOnDatacenter(context, hyperHost, volume);
} }
@Test(expected=CloudRuntimeException.class)
public void testFindVmOnDatacenterNullHyperHostReference() throws Exception {
when(hyperHost.getMor()).thenReturn(null);
_resource.findVmOnDatacenter(context, hyperHost, volume);
}
@Test @Test
public void testFindVmOnDatacenter() throws Exception { public void testFindVmOnDatacenter() throws Exception {
when(hyperHost.getHyperHostDatacenter()).thenReturn(mor); when(hyperHost.getHyperHostDatacenter()).thenReturn(mor);