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

Jump to bottom

Return default for empty environment variable #5983

Merged
merged 1 commit into from Oct 10, 2022
Merged

Return default for empty environment variable #5983

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
View file
Open in desktop
Expand Up @@ -230,7 +230,10 @@ private String getConfigurable(
}

if (environment.containsKey(envVarName)) {
return environment.get(envVarName);
String value = environment.get(envVarName);
if (!value.isEmpty()) {
return value;
}
}

for (final Properties properties : propertiesSources) {
Expand Down
8 changes: 8 additions & 0 deletions core/src/test/java/org/testcontainers/utility/TestcontainersConfigurationTest.java
View file
Open in desktop
Expand Up @@ -126,6 +126,14 @@ public void shouldReadDockerSettingsFromUserProperties() {
.isEqualTo("some value");
}

@Test
public void shouldNotReadSettingIfCorrespondingEnvironmentVarIsEmptyString() {
environment.put("DOCKER_FOO", "");
assertThat(newConfig().getEnvVarOrUserProperty("docker.foo", "default"))
.as("reads unprefixed env vars for docker. settings")
.isEqualTo("default");
}

@Test
public void shouldNotReadDockerClientStrategyFromClasspathProperties() {
String currentValue = newConfig().getDockerClientStrategyClassName();
Expand Down