Skip to content
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

Start container only if requested #1716

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Start container only if requested #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion integration-tests/techempower-postgres-it/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ tasks.withType( Test ).configureEach {

// We need a to use an instance of PostgreSQL with a specific configuration.
// So, for this particular integration-test module, we default to true unless docker is disabled.
systemProperty 'docker', project.properties['docker'] ?: true
systemProperty 'docker', project.hasProperty('docker')
systemProperty 'org.hibernate.reactive.common.InternalStateAssertions.ENFORCE', 'true'

if ( project.hasProperty( 'includeTests' ) ) {
Expand Down
17 changes: 4 additions & 13 deletions ...hempower-postgres-it/src/main/java/org/hibernate/reactive/it/techempower/VertxServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,12 @@ public class VertxServer {
private static final Log LOG = make( Log.class, lookup() );

// These properties are in DatabaseConfiguration in core
public static final boolean USE_DOCKER = isDockerEnabled();

// If not specify, default to enable docker
private static boolean isDockerEnabled() {
String enableDocker = System.getProperty( "docker" );
if ( enableDocker == null ) {
return true;
}
return Boolean.parseBoolean( enableDocker );
}
public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" );

public static final String IMAGE_NAME = "postgres:15-bullseye";
public static final String USERNAME = "benchmarkdbuser";
public static final String PASSWORD = "benchmarkdbpass";
public static final String DB_NAME = "hello_world";
public static final String USERNAME = "hreact";
public static final String PASSWORD = "hreact";
public static final String DB_NAME = "hreact";

public static final int VERTICLE_INSTANCES = 10;

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/verticle-postgres-it/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ tasks.withType( Test ).configureEach {
displayGranularity = 1
events = ['PASSED', 'FAILED', 'SKIPPED']
}
systemProperty 'docker', project.hasProperty( 'docker' ) ? 'true' : 'false'
systemProperty 'docker', project.hasProperty( 'docker' )
systemProperty 'org.hibernate.reactive.common.InternalStateAssertions.ENFORCE', 'true'

if ( project.hasProperty( 'includeTests' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion ...ts/verticle-postgres-it/src/main/java/org/hibernate/reactive/it/verticle/VertxServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class VertxServer {
private static final Log LOG = make( Log.class, lookup() );

// These properties are in DatabaseConfiguration in core
public static final boolean USE_DOCKER = true;
public static final boolean USE_DOCKER = Boolean.getBoolean( "docker" );

public static final String IMAGE_NAME = "postgres:15.2";
public static final String USERNAME = "hreact";
Expand Down