From 7305778749314bde6abac00db6bea9e4d1623e7a Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 18 Sep 2023 16:12:09 +0200
Subject: [PATCH] Fixed some tests and added timeout for env tests
---
.gitlab-ci.yml | 2 ++
.../at/tuwien/service/DatabaseServiceIntegrationTest.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c2d040e5..60880514a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,6 +124,7 @@ test-frontend:
test-default-deployment:
stage: test-deployment
+ timeout: 5m
needs:
- test-frontend
script:
@@ -135,6 +136,7 @@ test-default-deployment:
test-env-deployment:
stage: test-deployment
+ timeout: 5m
needs:
- test-frontend
script:
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index 20aadf3a08..5fd4fdf02b 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -190,7 +190,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
/* test */
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
}
@Test
@@ -224,14 +224,14 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
/* test */
assertThrows(SQLInvalidAuthorizationSpecException.class, () -> {
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
});
databaseService.updatePassword(User.builder()
.id(USER_3_ID)
.username(USER_3_USERNAME)
.mariadbPassword(USER_4_DATABASE_PASSWORD)
.build());
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
}
@Test
--
GitLab