Merge pull request #2821 from DataDog/glopes/fix-appsec-int-tests

cataphract · web-flow · commit 05ae6270e82a · 2024-08-29T22:18:17.000+01:00
Fix appsec integration tests
diff --git a/appsec/tests/integration/build.gradle b/appsec/tests/integration/build.gradle
@@ -157,6 +157,9 @@ def buildRunInDockerTask = { Map options ->
         volumes['php-tracer-cargo-cache'] = [
                 mountPoint: '/root/.cargo/registry',
         ]
+        volumes['php-tracer-cargo-cache-git'] = [
+                mountPoint: '/root/.cargo/git',
+        ]
     }
 
     def composerDlTask
@@ -443,6 +446,7 @@ task loadCaches(type: Exec) {
 
     dependsOn downloadCaches
     dependsOn 'createVolume-php-tracer-cargo-cache'
+    dependsOn 'createVolume-php-tracer-cargo-cache-git'
     dependsOn 'createVolume-php-appsec-hunter-cache'
 }
 
diff --git a/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/RoadRunnerTests.groovy b/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/RoadRunnerTests.groovy
@@ -8,7 +8,6 @@ import com.datadog.appsec.php.model.Span
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.EnabledIf
-import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy
 import org.testcontainers.containers.wait.strategy.WaitStrategy
 import org.testcontainers.containers.wait.strategy.WaitStrategyTarget
 import org.testcontainers.junit.jupiter.Container
@@ -23,7 +22,6 @@ import static com.datadog.appsec.php.integration.TestParams.getVariant
 import static com.datadog.appsec.php.integration.TestParams.phpVersionAtLeast
 import static com.datadog.appsec.php.test.JsonMatcher.matchesJson
 import static java.net.http.HttpResponse.BodyHandlers.ofString
-import static java.time.temporal.ChronoUnit.SECONDS
 import static org.hamcrest.MatcherAssert.assertThat
 
 @Testcontainers
@@ -45,7 +43,9 @@ class RoadRunnerTests {
                     phpVariant: variant,
                     www: 'roadrunner',
             ).with {
-                // we only start listening on http after run.sh has finished
+                // we only start listening on http after run.sh has finished,
+                // so mark immediately the container as ready. We instead check for liveliness
+                // in beforeAll()
                 setWaitStrategy(new WaitStrategy() {
                     @Override
                     void waitUntilReady(WaitStrategyTarget waitStrategyTarget) {
@@ -62,7 +62,14 @@ class RoadRunnerTests {
 
     @BeforeAll
     static void beforeAll() {
-        new HostPortWaitStrategy().withStartupTimeout(Duration.of(300, SECONDS) ).waitUntilReady(CONTAINER)
+        // wait until roadrunner is running
+        long deadline = System.currentTimeMillis() + 300_000
+        while (CONTAINER.execInContainer('grep', 'http server was started', '/tmp/logs/rr.log').exitCode != 0) {
+            if (System.currentTimeMillis() > deadline) {
+                throw new RuntimeException('Roadrunner did not start on time (see output of run.sh)')
+            }
+            Thread.sleep(500)
+        }
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,9 @@ def buildRunInDockerTask = { Map options ->`
`157`	`157`	`volumes['php-tracer-cargo-cache'] = [`
`158`	`158`	`mountPoint: '/root/.cargo/registry',`
`159`	`159`	`]`
	`160`	`+ volumes['php-tracer-cargo-cache-git'] = [`
	`161`	`+ mountPoint: '/root/.cargo/git',`
	`162`	`+ ]`
`160`	`163`	`}`
`161`	`164`
`162`	`165`	`def composerDlTask`
`@@ -443,6 +446,7 @@ task loadCaches(type: Exec) {`
`443`	`446`
`444`	`447`	`dependsOn downloadCaches`
`445`	`448`	`dependsOn 'createVolume-php-tracer-cargo-cache'`
	`449`	`+ dependsOn 'createVolume-php-tracer-cargo-cache-git'`
`446`	`450`	`dependsOn 'createVolume-php-appsec-hunter-cache'`
`447`	`451`	`}`
`448`	`452`