Skip to content

fix: return mapped port from MariaDBContainer.getLivenessCheckPortNumbers #11577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PreAgile wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −4
Open

fix: return mapped port from MariaDBContainer.getLivenessCheckPortNumbers #11577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5e2a7
fix: return mapped port from MariaDBContainer.getLivenessCheckPortNum…
PreAgile Mar 22, 2026
694f738
Merge branch 'main' into fix/mariadb-liveness-port-10359
PreAgile Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.testcontainers.containers;

import com.google.common.collect.Sets;
import org.testcontainers.images.builder.Transferable;
import org.testcontainers.utility.DockerImageName;

Expand Down Expand Up @@ -57,7 +56,7 @@ public MariaDBContainer(final DockerImageName dockerImageName) {

@Override
public Set<Integer> getLivenessCheckPortNumbers() {
return Sets.newHashSet(MARIADB_PORT);
return super.getLivenessCheckPortNumbers();
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions modules/mariadb/src/main/java/org/testcontainers/mariadb/MariaDBContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.testcontainers.mariadb;

import com.google.common.collect.Sets;
import org.testcontainers.containers.ContainerLaunchException;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.images.builder.Transferable;
Expand Down Expand Up @@ -50,7 +49,7 @@ public MariaDBContainer(final DockerImageName dockerImageName) {

@Override
public Set<Integer> getLivenessCheckPortNumbers() {
return Sets.newHashSet(MARIADB_PORT);
return super.getLivenessCheckPortNumbers();
}

@Override
Expand Down
7 changes: 7 additions & 0 deletions modules/mariadb/src/test/java/org/testcontainers/mariadb/MariaDBContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ void testSimple() throws SQLException {
int resultSetInt = resultSet.getInt(1);

assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
assertHasCorrectExposedAndLivenessCheckPorts(mariadb);
}
}

Expand Down Expand Up @@ -145,6 +146,12 @@ void testEmptyPasswordWithRootUser() throws SQLException {
}
}

private void assertHasCorrectExposedAndLivenessCheckPorts(MariaDBContainer mariadb) {
assertThat(mariadb.getExposedPorts()).containsExactly(MariaDBContainer.MARIADB_PORT);
assertThat(mariadb.getLivenessCheckPortNumbers())
.containsExactly(mariadb.getMappedPort(MariaDBContainer.MARIADB_PORT));
}

private void assertThatCustomIniFileWasUsed(MariaDBContainer mariadb) throws SQLException {
try (ResultSet resultSet = performQuery(mariadb, "SELECT @@GLOBAL.innodb_max_undo_log_size")) {
long result = resultSet.getLong(1);
Expand Down
Loading