mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Valery Kharseko
yesterday beb6af6bbbb8c08ad4e27f459ebd6a9e55ef6f8a
Stabilize Oracle JDBC backend test on CI (#662)
2 files modified
20 ■■■■ changed files
opendj-server-legacy/src/test/java/org/opends/server/backends/jdbc/OracleTestCase.java 8 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/backends/jdbc/TestCase.java 12 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/backends/jdbc/OracleTestCase.java
@@ -21,25 +21,25 @@
import java.time.Duration;
//docker run --rm --name oracle-db -p 1521:1521 -e APP_USER=opendj -e ORACLE_DATABASE=database_name -e APP_USER_PASSWORD=password gvenzl/oracle-free:23.4-slim-faststart
//docker run --rm --name oracle-db -p 1521:1521 -e APP_USER=opendj -e ORACLE_DATABASE=database_name -e APP_USER_PASSWORD=password gvenzl/oracle-free:23.26.2-slim-faststart
@Test(sequential = true)
public class OracleTestCase extends TestCase {
    @Override
    protected JdbcDatabaseContainer<?> getContainer() {
        return new OracleContainer("gvenzl/oracle-free:23.6-faststart")
        return new OracleContainer("gvenzl/oracle-free:23.26.2-slim-faststart")
                .withExposedPorts(1521)
                .withUsername("opendj")
                .withPassword("password")
                .withDatabaseName("database_name")
                .withStartupTimeout(Duration.ofMinutes(5))
                .withStartupAttempts(10);
                .withStartupAttempts(2);
    }
    @Override
    protected String getContainerDockerCommand() {
        return "run before test: docker run --rm --name oracle-db -p 1521:1521 -e APP_USER=opendj -e ORACLE_DATABASE=database_name -e APP_USER_PASSWORD=password gvenzl/oracle-free:23.4-slim-faststart";
        return "run before test: docker run --rm --name oracle-db -p 1521:1521 -e APP_USER=opendj -e ORACLE_DATABASE=database_name -e APP_USER_PASSWORD=password gvenzl/oracle-free:23.26.2-slim-faststart";
    }
    @Override
opendj-server-legacy/src/test/java/org/opends/server/backends/jdbc/TestCase.java
@@ -39,8 +39,16 @@
    @Override
    public void setUp() throws Exception {
        if(DockerClientFactory.instance().isDockerAvailable()) {
            container = getContainer();
            container.start();
            try {
                container = getContainer();
                container.start();
            } catch (Exception e) {
                // The database container could not be started (e.g. a slow/flaky image
                // pull or DB initialization failure on CI). Skip the test instead of
                // failing the whole build - container startup is an infrastructure
                // concern, not a regression in the JDBC backend under test.
                throw new SkipException(getContainerDockerCommand());
            }
        }
        try(Connection ignored = DriverManager.getConnection(createBackendCfg().getDBDirectory())){