diff --git a/client/pom.xml b/client/pom.xml index cbe45d88b6c..9da01e8647e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -860,8 +860,6 @@ com.tngtech.java:junit-dataprovider org.mockito:mockito-all org.hamcrest:hamcrest-all - org.powermock:powermock-module-junit4 - org.powermock:powermock-api-mockito2 org.springframework:spring-test org.apache.tomcat.embed:tomcat-embed-core org.apache.geronimo.specs:geronimo-servlet_3.0_spec diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 59a3421b08b..8ae6d461fea 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -82,7 +82,6 @@ import org.libvirt.DomainInfo.DomainState; import org.libvirt.DomainInterfaceStats; import org.libvirt.LibvirtException; import org.libvirt.MemoryStatistic; -import org.libvirt.NodeInfo; import org.libvirt.SchedUlongParameter; import org.libvirt.StorageVol; import org.libvirt.VcpuInfo; @@ -936,13 +935,7 @@ public class LibvirtComputingResourceTest { Mockito.when(domain.memoryStats(20)).thenReturn(domainMem); Mockito.when(domainMem[0].getTag()).thenReturn(4); Mockito.when(connect.domainLookupByName(VMNAME)).thenReturn(domain); - final NodeInfo nodeInfo = new NodeInfo(); - nodeInfo.cpus = 8; - nodeInfo.memory = 8 * 1024 * 1024; - nodeInfo.sockets = 2; - nodeInfo.threads = 2; - nodeInfo.model = "Foo processor"; - Mockito.when(connect.nodeInfo()).thenReturn(nodeInfo); + // this is testing the interface stats, returns an increasing number of sent and received bytes Mockito.when(domain.interfaceStats(nullable(String.class))).thenAnswer(new org.mockito.stubbing.Answer() { @@ -1752,8 +1745,6 @@ public class LibvirtComputingResourceTest { try { when(conn.domainLookupByName(vmName)).thenReturn(dm); - when(dm.getXMLDesc(8)).thenReturn("" + " " + " " - + " " + " " + " " + ""); when(dm.getXMLDesc(1)).thenReturn("" + " " + " " + " " + " " + " " + ""); when(dm.isPersistent()).thenReturn(1); diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java index a7ca3db99e4..8a2ba71a6fc 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java @@ -230,7 +230,6 @@ public class KVMStorageProcessorTest { @Test (expected = LibvirtException.class) public void validateTakeVolumeSnapshotFailToCreateSnapshotThrowLibvirtException() throws LibvirtException{ Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(), Mockito.anyString(), Mockito.any()); - Mockito.doReturn("").when(domainMock).getName(); Mockito.doReturn(new HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second(); Mockito.doThrow(LibvirtException.class).when(domainMock).snapshotCreateXML(Mockito.anyString(), Mockito.anyInt()); @@ -242,7 +241,6 @@ public class KVMStorageProcessorTest { String expectedResult = "label"; Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(), Mockito.anyString(), Mockito.any()); - Mockito.doReturn("").when(domainMock).getName(); Mockito.doReturn(expectedResult).when(diskToSnapshotAndDisksToAvoidMock).first(); Mockito.doReturn(new HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second(); Mockito.doReturn(null).when(domainMock).snapshotCreateXML(Mockito.anyString(), Mockito.anyInt()); diff --git a/plugins/storage/volume/storpool/pom.xml b/plugins/storage/volume/storpool/pom.xml index f0a3972d3e5..437e236dc6f 100644 --- a/plugins/storage/volume/storpool/pom.xml +++ b/plugins/storage/volume/storpool/pom.xml @@ -1,4 +1,4 @@ -