apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix storpool test & remove powermock (#7652)

Browse Source 
This PR fixes unit tests for plugins/storage/volume/storpool/ and removes powermock.
This commit is contained in:
Vishesh 2023-06-27 14:55:19 +05:30 committed by GitHub
parent 908b3b7dfa
commit c3718ab92e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/storage/volume/storpool/pom.xml
View File

@ -66,9 +66,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
<executions>
<execution>
<phase>integration-test</phase>

7
plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolUtil.java
View File

@ -54,6 +54,8 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@ -67,7 +69,10 @@ import java.util.UUID;
public class StorPoolUtil {
private static final Logger log = Logger.getLogger(StorPoolUtil.class);
private static final File spLogFile = new File("/var/log/cloudstack/management/storpool-plugin.log");
private static final File spLogFile = new File(
Files.exists(Paths.get("/var/log/cloudstack/management/")) ?
"/var/log/cloudstack/management/storpool-plugin.log" :
"/tmp/storpool-plugin.log");
private static PrintWriter spLogPrinterWriter = spLogFileInitialize();
private static PrintWriter spLogFileInitialize() {

4
plugins/storage/volume/storpool/src/test/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriverTest.java
View File

@ -47,18 +47,16 @@ import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.powermock.core.classloader.annotations.PrepareForTest;
import java.util.UUID;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mock;
@RunWith(MockitoJUnitRunner.class)
@PrepareForTest(StorPoolUtil.class)
public class StorPoolPrimaryDataStoreDriverTest {
@Mock