Skip to content

Commit 43bf43e

Browse files
committed
fix tests and small bug
1 parent 1cefa78 commit 43bf43e

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,6 +1337,9 @@ protected List<BackupDeltaTO> getBackupDeltaTOList(long backupId) {
13371337
}
13381338

13391339
protected void cleanupValidation(boolean startedVm, UserVmVO validationVm, BackupVO backupVO, List<VolumeVO> volumeVOs) {
1340+
if (validationVm == null) {
1341+
return;
1342+
}
13401343
if (startedVm) {
13411344
userVmManager.stopVirtualMachine(validationVm.getId(), true);
13421345
}

plugins/backup/kboss/src/test/java/org/apache/cloudstack/backup/KbossBackupProviderTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ public void validateWithValidationVmTestValidationVmIsNull() {
15611561
boolean result = kbossBackupProviderSpy.validateWithValidationVm(backupId, 2L, backupVoMock);
15621562

15631563
assertFalse(result);
1564-
verify(kbossBackupProviderSpy, never()).cleanupValidation(anyBoolean(), any(), any(), any());
1564+
verify(kbossBackupProviderSpy).cleanupValidation(anyBoolean(), any(), any(), any());
15651565
}
15661566

15671567
@Test
@@ -2819,7 +2819,7 @@ public void validateCompressionStateForRestoreAndGetBackupTestUnableToLock() {
28192819
Pair<Boolean, BackupVO> result = kbossBackupProviderSpy.validateCompressionStateForRestoreAndGetBackup(backupId);
28202820

28212821
assertFalse(result.first());
2822-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
2822+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
28232823
}
28242824

28252825
@Test
@@ -2856,7 +2856,7 @@ public void validateBackupStateForRemovalTestUnableToLock() {
28562856
boolean result = kbossBackupProviderSpy.validateBackupStateForRemoval(backupId);
28572857

28582858
assertFalse(result);
2859-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
2859+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
28602860
}
28612861

28622862
@Test
@@ -2922,7 +2922,7 @@ public void validateBackupStateForStartCompressionAndUpdateCompressionStatusTest
29222922

29232923
assertFalse(result.first());
29242924
verify(backupDaoMock, never()).update(backupId, backupVoMock);
2925-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
2925+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
29262926
}
29272927

29282928
@Test
@@ -2961,7 +2961,7 @@ public void validateBackupStateForFinalizeCompressionTestUnableToLock() {
29612961

29622962
assertFalse(result.first());
29632963
verify(backupDaoMock, never()).update(backupId, backupVoMock);
2964-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
2964+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
29652965
}
29662966

29672967
@Test
@@ -3028,7 +3028,7 @@ public void validateBackupStateForRestoreBackupToVMTestUnableToLock() {
30283028

30293029
assertFalse(result.first());
30303030
verify(backupDaoMock, never()).update(backupId, backupVoMock);
3031-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
3031+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
30323032
}
30333033

30343034
@Test
@@ -3077,7 +3077,7 @@ public void validateBackupStateForValidationTestUnableToLock() {
30773077
boolean result = kbossBackupProviderSpy.validateBackupStateForValidation(backupId);
30783078

30793079
assertFalse(result);
3080-
verify(kbossBackupProviderSpy).releaseBackup(backupId);
3080+
verify(kbossBackupProviderSpy, never()).releaseBackup(backupId);
30813081
}
30823082

30833083
@Test

0 commit comments

Comments
 (0)