fix test

Author: johnstcn

integration/integration_test.go

@@ -1970,18 +1970,27 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
 			envbuilderEnv("GIT_URL", srv.URL),
 			envbuilderEnv("CACHE_REPO", notRegURL),
 			envbuilderEnv("PUSH_IMAGE", "1"),
-			envbuilderEnv("INIT_SCRIPT", "exit \\${ENVBUILDER_EXIT_CODE:-254}"),
+			envbuilderEnv("INIT_SCRIPT", `exit ${ENVBUILDER_EXIT_CODE:-254}`),
 		}})
 		require.NoError(t, err)
 
 		// Then: envbuilder should fail with a descriptive status code.
 		client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 		require.NoError(t, err)
 		defer client.Close()
-		// Get the container exit status.
-		status, err := client.ContainerInspect(context.Background(), ctrID)
-		require.NoError(t, err)
-		require.Equal(t, 254, status.State.ExitCode)
+		// Get the container exit status. Note that the container may take a while to fully exit
+		// so we need to retry a couple of times.
+		require.Eventually(t, func() bool {
+			status, err := client.ContainerInspect(context.Background(), ctrID)
+			if !assert.NoError(t, err) {
+				return false
+			}
+			if status.State.Running {
+				t.Logf("container %q still running", ctrID)
+				return false
+			}
+			return assert.Equal(t, status.State.ExitCode, 254, "unexpected exit code")
+		}, 10*time.Second, time.Second, "unexpected exit code")
 	})
 
 	t.Run("CacheAndPushDevcontainerFeatures", func(t *testing.T) {