From 5cc9070b0b2663656af1c772800350ea2265c4ce Mon Sep 17 00:00:00 2001 From: John Burwell Date: Thu, 17 Nov 2016 00:09:56 -0500 Subject: [PATCH] Cleanup merge mistakes --- .../hypervisor/vmware/resource/VmwareResourceTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java index c8143a7e0f7..6f411dcca39 100644 --- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java +++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java @@ -30,8 +30,6 @@ import static org.mockito.Mockito.times; import java.util.ArrayList; import static org.powermock.api.mockito.PowerMockito.whenNew; -import static org.powermock.api.mockito.PowerMockito.whenNew; - import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; @@ -341,12 +339,6 @@ public class VmwareResourceTest { _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 public void testFindVmOnDatacenter() throws Exception { when(hyperHost.getHyperHostDatacenter()).thenReturn(mor);