From c48fff8f20d88aeed73683cea34fdc41a7cc813f Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 31 May 2021 17:15:24 +0200
Subject: [PATCH] integration test seems not to respect the database reset
Former-commit-id: 534a942239af1ccf7fdd44b93eedb38649e19ee9
---
.gitlab-ci.yml | 8 +++++++-
.../src/test/java/at/tuwien/BaseIntegrationTest.java | 2 --
.../tuwien/service/ContainerServiceIntegrationTest.java | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81fbe06d4f..83f7b222ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,12 @@ build-docker:
build-metadata-db:
stage: build
script:
- - docker system prune -f --volumes
- "mvn -f fda-metadata-db/pom.xml clean install" # local maven2 repository
test-backend-container:
stage: test
script:
+ - docker system prune -f --volumes
- "./fda-container-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-container-service/pom.xml clean test verify"
- "./fda-container-service/rest-service/src/test/resources/integration-test.after"
@@ -41,6 +41,7 @@ test-backend-container:
artifacts:
when: always
paths:
+ - docker system prune -f --volumes
- fda-container-service/rest-service/target/site/jacoco/jacoco.xml
- fda-container-service/rest-service/target/site/jacoco/index.html
reports:
@@ -50,6 +51,7 @@ test-backend-container:
test-backend-database:
stage: test
script:
+ - docker system prune -f --volumes
- "./fda-database-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-database-service/pom.xml clean test verify"
- "./fda-database-service/rest-service/src/test/resources/integration-test.after"
@@ -70,16 +72,19 @@ test-backend-database:
test-backend-discovery:
stage: test
script:
+ - docker system prune -f --volumes
- "mvn -f fda-discovery-service/pom.xml clean test verify"
test-backend-gateway:
stage: test
script:
+ - docker system prune -f --volumes
- "mvn -f fda-gateway-service/pom.xml clean test verify"
test-backend-query:
stage: test
script:
+ - docker system prune -f --volumes
- "./fda-query-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-query-service/pom.xml clean test verify"
- "./fda-query-service/rest-service/src/test/resources/integration-test.after"
@@ -100,6 +105,7 @@ test-backend-query:
test-backend-table:
stage: test
script:
+ - docker system prune -f --volumes
- "./fda-table-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-table-service/pom.xml clean test verify"
- "./fda-table-service/rest-service/src/test/resources/integration-test.after"
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
index 4e76d11328..94025ba47a 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/BaseIntegrationTest.java
@@ -73,7 +73,6 @@ public abstract class BaseIntegrationTest {
public final ContainerImage CONTAINER_1_IMAGE = IMAGE_1;
public final String CONTAINER_1_NAME = "u01";
public final String CONTAINER_1_INTERNAL_NAME = "u01";
- public final String CONTAINER_1_DATABASE = "univie";
public final String CONTAINER_1_IP = "172.28.0.3";
public final Instant CONTAINER_1_CREATED = Instant.now().minus(1, HOURS);
@@ -82,7 +81,6 @@ public abstract class BaseIntegrationTest {
public final ContainerImage CONTAINER_2_IMAGE = IMAGE_2;
public final String CONTAINER_2_NAME = "t01";
public final String CONTAINER_2_INTERNAL_NAME = "u01";
- public final String CONTAINER_2_DATABASE = "tuw";
public final String CONTAINER_2_IP = "172.28.0.4";
public final Instant CONTAINER_2_CREATED = Instant.now().minus(1, HOURS);
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index e09d78b637..8af457549a 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -53,6 +53,7 @@ public class ContainerServiceIntegrationTest extends BaseIntegrationTest {
@Transactional
@BeforeEach
public void beforeEach() {
+ afterEach();
/* create network */
dockerClient.createNetworkCmd()
.withName("fda-userdb")
--
GitLab