Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Commits
73057787
Verified
Commit
73057787
authored
1 year ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Fixed some tests and added timeout for env tests
parent
4441f27e
No related branches found
No related tags found
4 merge requests
!231
CI: Remove build for log-service
,
!228
Better error message handling in the frontend
,
!223
Release of version 1.4.0
,
!194
Hotfix
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+3
-3
3 additions, 3 deletions
...ava/at/tuwien/service/DatabaseServiceIntegrationTest.java
with
5 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
0
View file @
73057787
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+
3
−
3
View file @
73057787
...
...
@@ -190,7 +190,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
/* test */
MariaDbConfig
.
getPrivileges
(
mariaDBContainer
.
getHost
(),
mariaDBContainer
.
getMappedPort
(
330
6
)
,
database
.
getInternalName
(),
USER_1_USERNAME
,
USER_1_PASSWORD
);
MariaDbConfig
.
getPrivileges
(
mariaDBContainer
.
getHost
(),
330
8
,
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
(
330
6
)
,
USER_3_USERNAME
,
USER_4_PASSWORD
);
MariaDbConfig
.
getPrivileges
(
mariaDBContainer
.
getHost
(),
330
8
,
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
(
330
6
)
,
USER_3_USERNAME
,
USER_4_PASSWORD
);
MariaDbConfig
.
getPrivileges
(
mariaDBContainer
.
getHost
(),
330
8
,
USER_3_USERNAME
,
USER_4_PASSWORD
);
}
@Test
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment