From d6f441375ba214ad849c370798a7fdc3d6ff5bc6 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 27 Jul 2020 17:49:18 +0200 Subject: Attempt to fix the verify job problem Remove the parallel execution of the Integration tests Issue-ID: CLAMP-899 Signed-off-by: sebdet Change-Id: Ia4d60941821f1e5363d5ba5e734a0d9a5ec9186d --- pom.xml | 4 ++-- src/test/java/org/onap/clamp/clds/it/HttpsItCase.java | 4 ++-- src/test/java/org/onap/clamp/clds/it/RobotItCase.java | 2 ++ 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 @@ **/*ItCase.java - 1C - false + 1 + true false ${failsafeArgLine} 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}") -- cgit 1.2.3-korg