Skip to content

Commit 4bad091

Browse files
committed
fix(dev): Make dev service tests more resilient
Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
1 parent dd44832 commit 4bad091

7 files changed

Lines changed: 16 additions & 16 deletions

File tree

arconia-dev/arconia-dev-services/arconia-dev-services-oracle-xe/src/main/java/io/arconia/dev/services/oracle/OracleXeDevServicesProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class OracleXeDevServicesProperties implements DevServicesProperties {
3939
/**
4040
* Maximum waiting time for the service to start.
4141
*/
42-
private Duration startupTimeout = Duration.ofSeconds(60);
42+
private Duration startupTimeout = Duration.ofSeconds(120);
4343

4444
@Override
4545
public boolean isEnabled() {

arconia-dev/arconia-dev-services/arconia-dev-services-oracle-xe/src/test/java/io/arconia/dev/services/oracle/OracleXeDevServicesPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void shouldCreateInstanceWithDefaultValues() {
2525
OracleXeDevServicesProperties properties = new OracleXeDevServicesProperties();
2626

2727
assertThat(properties.isEnabled()).isTrue();
28-
assertThat(properties.getImageName()).isEqualTo("gvenzl/oracle-xe:21-slim-faststart");
29-
assertThat(properties.getStartupTimeout()).isEqualTo(Duration.ofSeconds(60));
28+
assertThat(properties.getImageName()).contains("gvenzl/oracle-xe");
29+
assertThat(properties.getStartupTimeout()).isEqualTo(Duration.ofSeconds(120));
3030
assertThat(properties.getEnvironment()).isEmpty();
3131
assertThat(properties.getShared()).isEqualTo(DevServicesProperties.Shared.NEVER);
3232
}

arconia-dev/arconia-dev-services/arconia-dev-services-oracle/src/main/java/io/arconia/dev/services/oracle/OracleDevServicesProperties.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ public class OracleDevServicesProperties implements DevServicesProperties {
2626
*/
2727
private String imageName = "gvenzl/oracle-free:23.7-slim-faststart";
2828

29-
/**
30-
* The maximum waiting time for the container to start.
31-
*/
32-
private Duration startupTimeout = Duration.ofSeconds(60);
33-
3429
/**
3530
* Environment variables to set in the service.
3631
*/
@@ -41,6 +36,11 @@ public class OracleDevServicesProperties implements DevServicesProperties {
4136
*/
4237
private Shared shared = Shared.NEVER;
4338

39+
/**
40+
* Maximum waiting time for the service to start.
41+
*/
42+
private Duration startupTimeout = Duration.ofSeconds(120);
43+
4444
@Override
4545
public boolean isEnabled() {
4646
return enabled;

arconia-dev/arconia-dev-services/arconia-dev-services-oracle/src/test/java/io/arconia/dev/services/oracle/OracleDevServicesPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void shouldCreateInstanceWithDefaultValues() {
2525
OracleDevServicesProperties properties = new OracleDevServicesProperties();
2626

2727
assertThat(properties.isEnabled()).isTrue();
28-
assertThat(properties.getImageName()).isEqualTo("gvenzl/oracle-free:23-slim-faststart");
29-
assertThat(properties.getStartupTimeout()).isEqualTo(Duration.ofSeconds(60));
28+
assertThat(properties.getImageName()).contains("gvenzl/oracle-free");
29+
assertThat(properties.getStartupTimeout()).isEqualTo(Duration.ofSeconds(120));
3030
assertThat(properties.getEnvironment()).isEmpty();
3131
assertThat(properties.getShared()).isEqualTo(DevServicesProperties.Shared.NEVER);
3232
}

arconia-dev/arconia-dev-services/arconia-dev-services-postgresql/src/test/java/io/arconia/dev/services/postgresql/PostgresqlDevServicesPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void shouldCreateInstanceWithDefaultValues() {
2424
PostgresqlDevServicesProperties properties = new PostgresqlDevServicesProperties();
2525

2626
assertThat(properties.isEnabled()).isTrue();
27-
assertThat(properties.getImageName()).isEqualTo("postgres:17.4-alpine");
27+
assertThat(properties.getImageName()).contains("postgres");
2828
assertThat(properties.getEnvironment()).isEmpty();
2929
assertThat(properties.getShared()).isEqualTo(DevServicesProperties.Shared.NEVER);
3030
}

docs/modules/dev-services/pages/oracle-xe.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You can configure the Dev Service via configuration properties.
4040
| When the dev service is shared across applications.
4141

4242
| `arconia.dev.services.oracle-xe.startup-timeout`
43-
| `60s`
43+
| `120s`
4444
| Maximum waiting time for the service to start.
4545
|===
4646

docs/modules/dev-services/pages/oracle.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ You can configure the Dev Service via configuration properties.
3131
| `gvenzl/oracle-free`
3232
| Full name of the container image used in the dev service.
3333

34-
| `arconia.dev.services.oracle.startup-timeout`
35-
| `60s`
36-
| The maximum waiting time for the container to start.
37-
3834
| `arconia.dev.services.oracle.environment`
3935
| `{}`
4036
| Environment variables to set in the container. Example: `ORACLE_PASSWORD: "secret"`.
4137

4238
| `arconia.dev.services.oracle.shared`
4339
| `never`
4440
| When the dev service is shared across applications.
41+
42+
| `arconia.dev.services.oracle.startup-timeout`
43+
| `120s`
44+
| Maximum waiting time for the service to start.
4545
|===
4646

4747
include::partial$disabling-dev-service.adoc[]

0 commit comments

Comments
 (0)