Skip to content

Commit 7e94fb0

Browse files
unit test fixes
1 parent 526f449 commit 7e94fb0

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 2 deletions
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;
@@ -173,7 +174,7 @@ public void testAttachZone_UnsupportedHypervisor() throws Exception {
173174
@Test
174175
public void testMaintain() {
175176
final DataStore store = mock(DataStore.class);
176-
when(storagePoolAutomation.maintain(any(DataStore.class))).thenReturn(true);
177+
when(storagePoolAutomation.maintain(any(DataStore.class), anyMap())).thenReturn(true);
177178
when(dataStoreHelper.maintain(any(DataStore.class))).thenReturn(true);
178179
final boolean result = scaleIOPrimaryDataStoreLifeCycleTest.maintain(store);
179180
assertThat(result).isTrue();
@@ -183,7 +184,7 @@ public void testMaintain() {
183184
public void testCancelMaintain() {
184185
final DataStore store = mock(DataStore.class);
185186
when(dataStoreHelper.cancelMaintain(any(DataStore.class))).thenReturn(true);
186-
when(storagePoolAutomation.cancelMaintain(any(DataStore.class))).thenReturn(true);
187+
when(storagePoolAutomation.cancelMaintain(any(DataStore.class), anyMap())).thenReturn(true);
187188
final boolean result = scaleIOPrimaryDataStoreLifeCycleTest.cancelMaintain(store);
188189
assertThat(result).isTrue();
189190
}

0 commit comments

Comments
 (0)