You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jb...@apache.org on 2016/11/17 05:32:46 UTC
[4/4] git commit: updated refs/heads/master to 5cc9070
Cleanup merge mistakes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cc9070b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cc9070b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cc9070b
Branch: refs/heads/master
Commit: 5cc9070b0b2663656af1c772800350ea2265c4ce
Parents: c66cf1c
Author: John Burwell <me...@cockamamy.net>
Authored: Thu Nov 17 00:09:56 2016 -0500
Committer: John Burwell <me...@cockamamy.net>
Committed: Thu Nov 17 00:09:56 2016 -0500
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/resource/VmwareResourceTest.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cc9070b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
----------------------------------------------------------------------
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 c8143a7..6f411dc 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);