From 9272f88fe6716d98d36eb1778354d838eb4b371f Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Mon, 4 Mar 2019 11:59:41 -0500 Subject: [PATCH] Increase docker container timeout in tests to help with stability on underpowered machines running builds --- .../rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy | 2 ++ .../trace/instrumentation/spymemcached/SpymemcachedTest.groovy | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy index 219128482c..7a5c08d089 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy @@ -22,6 +22,7 @@ import org.testcontainers.containers.GenericContainer import spock.lang.Requires import spock.lang.Shared +import java.time.Duration import java.util.concurrent.Phaser import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace @@ -56,6 +57,7 @@ class RabbitMQTest extends AgentTestRunner { if ("true" != System.getenv("CI")) { rabbbitMQContainer = new GenericContainer('rabbitmq:latest') .withExposedPorts(defaultRabbitMQPort) + .withStartupTimeout(Duration.ofSeconds(120)) // .withLogConsumer { output -> // print output.utf8String // } diff --git a/dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy b/dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy index d00ad72ddb..2f02de169e 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy +++ b/dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy @@ -17,6 +17,7 @@ import org.testcontainers.containers.GenericContainer import spock.lang.Requires import spock.lang.Shared +import java.time.Duration import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.BlockingQueue import java.util.concurrent.ExecutorService @@ -63,6 +64,7 @@ class SpymemcachedTest extends AgentTestRunner { if ("true" != System.getenv("CI")) { memcachedContainer = new GenericContainer('memcached:latest') .withExposedPorts(defaultMemcachedPort) + .withStartupTimeout(Duration.ofSeconds(120)) memcachedContainer.start() memcachedAddress = new InetSocketAddress( memcachedContainer.containerIpAddress,