Update test to match lazy eval labels test (GoogleContainerTools#4067)

paulvdbles · Oct 7, 2024 · 6385257 · 6385257
1 parent 1109172
commit 6385257
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java b/jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibPluginTest.java
@@ -373,7 +373,7 @@ public void testLazyEvalForEnvironment() {
     BuildResult showEnvironment = testProject.build("showenvironment", "-Djib.console=plain");
     assertThat(showEnvironment.getOutput())
             .contains(
-                    "environment contains values [var1:val1updated, var2:val2updated]");
+                    "environment contains values [var1:updated-first-environment-var, var2:updated-second-environment-var]");
   }
 
   @Test

diff --git a/jib-gradle-plugin/src/test/resources/gradle/projects/lazy-evaluation/build.gradle b/jib-gradle-plugin/src/test/resources/gradle/projects/lazy-evaluation/build.gradle
@@ -27,10 +27,6 @@ project.afterEvaluate {
     project.ext.getCustomPermissions = { -> return ['/updated': '755'] }
     project.ext.jibCreationTime = '2022-07-19T10:23:42Z'
     project.ext.jibFilesModificationTime = '2022-07-19T11:23:42Z'
-    project.ext.jibEnvrionment = [
-            "var1": "val1updated",
-            "var2": "val2updated"
-    ]
 }
 
 jib {
@@ -46,7 +42,12 @@ jib {
             ]
         }
         entrypoint = project.provider { [project.ext.value] }
-        environment = project.provider { project.ext.jibEnvrionment }
+        environment = project.provider {
+            [
+                    var1 : project.ext.value + '-first-environment-var',
+                    var2: project.ext.value + '-second-environment-var'
+            ]
+        }
         creationTime = project.provider { project.ext.jibCreationTime }
         filesModificationTime = project.provider { project.ext.jibFilesModificationTime }
         mainClass = project.provider { project.ext.value }