summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-07-27 17:49:18 +0200
committersebdet <sebastien.determe@intl.att.com>2020-07-29 10:33:21 +0200
commitd6f441375ba214ad849c370798a7fdc3d6ff5bc6 (patch)
tree6d4b527b952d2a9102f881e9436d95d89ae8015e
parent083e5a2aefd76bb1fc25bcb5528b7288b059c1c2 (diff)
Attempt to fix the verify job problem
Remove the parallel execution of the Integration tests Issue-ID: CLAMP-899 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ia4d60941821f1e5363d5ba5e734a0d9a5ec9186d
-rw-r--r--pom.xml4
-rw-r--r--src/test/java/org/onap/clamp/clds/it/HttpsItCase.java4
-rw-r--r--src/test/java/org/onap/clamp/clds/it/RobotItCase.java2
3 files changed, 6 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 245bae022..6eb411a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -914,8 +914,8 @@
<includes>
<include>**/*ItCase.java</include>
</includes>
- <forkCount>1C</forkCount>
- <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>${failsafeArgLine}</argLine>
</configuration>
diff --git a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
index 510e32736..90a240181 100644
--- a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
@@ -29,14 +29,12 @@ import java.io.File;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.nio.charset.Charset;
-
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-
import org.apache.commons.io.FileUtils;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,6 +45,7 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.client.RestTemplate;
@@ -57,6 +56,7 @@ import org.springframework.web.client.RestTemplate;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
@TestPropertySource(locations = "classpath:https/https-test.properties")
+@DirtiesContext
public class HttpsItCase {
@Value("${server.port}")
diff --git a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java b/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
index b386d9bb8..5eff96e44 100644
--- a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
@@ -45,12 +45,14 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@TestPropertySource(locations = "classpath:robotframework/robotframework-test.properties")
+@DirtiesContext
public class RobotItCase {
@Value("${server.port}")