Skip to content

Commit

Permalink
Rename variables(GoogleContainerTools#4067)
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul van der Bles committed Oct 7, 2024
1 parent 84ea09c commit 1109172
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ public void setJvmFlags(Provider<List<String>> jvmFlags) {
public MapProperty<String, String> getEnvironment() {
String environmentProperty = System.getProperty(PropertyNames.CONTAINER_ENVIRONMENT);
if (environmentProperty != null) {
Map<String, String> parsedLabels =
Map<String, String> parsedEnvironment =
ConfigurationPropertyValidator.parseMapProperty(environmentProperty);
if (!parsedLabels.equals(environment.get())) {
environment.set(parsedLabels);
if (!parsedEnvironment.equals(environment.get())) {
environment.set(parsedEnvironment);
}
}
return environment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ public void testLazyEvalForLabels() {

@Test
public void testLazyEvalForEnvironment() {
BuildResult showLabels = testProject.build("showenvironment", "-Djib.console=plain");
assertThat(showLabels.getOutput())
BuildResult showEnvironment = testProject.build("showenvironment", "-Djib.console=plain");
assertThat(showEnvironment.getOutput())
.contains(
"environment contains values [var1:val1updated, var2:val2updated]");
}
Expand Down

0 comments on commit 1109172

Please sign in to comment.