Skip to content

Commit 86f5f0c

Browse files
unit test fixes
1 parent 71c3553 commit 86f5f0c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public interface ScaleIOSDCManager {
5151
* Prepares the SDC on the host (adds the MDM IPs to SDC, starts scini service if required).
5252
* @param host the host
5353
* @param dataStore the datastore
54-
* @return SDC Id of the host if SDC is successfully prepared-ed on the hostgetSdcIdByGuid
54+
* @return SDC Id of the host if SDC is successfully prepared-ed on the host
5555
*/
5656
String prepareSDC(Host host, DataStore dataStore);
5757

plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycleTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static com.google.common.truth.Truth.assertThat;
2323
import static org.mockito.ArgumentMatchers.any;
2424
import static org.mockito.ArgumentMatchers.anyLong;
25+
import static org.mockito.ArgumentMatchers.anyMap;
2526
import static org.mockito.ArgumentMatchers.eq;
2627
import static org.mockito.Mockito.lenient;
2728
import static org.mockito.Mockito.mock;
@@ -176,7 +177,7 @@ public void testAttachZone_UnsupportedHypervisor() throws Exception {
176177
@Test
177178
public void testMaintain() {
178179
final DataStore store = mock(DataStore.class);
179-
when(storagePoolAutomation.maintain(any(DataStore.class))).thenReturn(true);
180+
when(storagePoolAutomation.maintain(any(DataStore.class), anyMap())).thenReturn(true);
180181
when(dataStoreHelper.maintain(any(DataStore.class))).thenReturn(true);
181182
final boolean result = scaleIOPrimaryDataStoreLifeCycleTest.maintain(store);
182183
assertThat(result).isTrue();
@@ -186,7 +187,7 @@ public void testMaintain() {
186187
public void testCancelMaintain() {
187188
final DataStore store = mock(DataStore.class);
188189
when(dataStoreHelper.cancelMaintain(any(DataStore.class))).thenReturn(true);
189-
when(storagePoolAutomation.cancelMaintain(any(DataStore.class))).thenReturn(true);
190+
when(storagePoolAutomation.cancelMaintain(any(DataStore.class), anyMap())).thenReturn(true);
190191
final boolean result = scaleIOPrimaryDataStoreLifeCycleTest.cancelMaintain(store);
191192
assertThat(result).isTrue();
192193
}

0 commit comments

Comments
 (0)