From c1914da54fe6a7594514859b6127bab9dfb6319f Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 26 Feb 2019 13:33:50 -0500 Subject: [PATCH] Increase time we wait for smoke tests servers to start up Default 60 seconds often pass when run on laptop in paralle mode. --- dd-smoke-tests/play/play.gradle | 3 ++- dd-smoke-tests/springboot/springboot.gradle | 1 + dd-smoke-tests/wildfly/wildfly.gradle | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dd-smoke-tests/play/play.gradle b/dd-smoke-tests/play/play.gradle index 8269c824ec..765cbeba7b 100644 --- a/dd-smoke-tests/play/play.gradle +++ b/dd-smoke-tests/play/play.gradle @@ -84,9 +84,10 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) { // these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput waitForPort = playHttpPort waitForOutput = "Listening for HTTP on /127.0.0.1:${playHttpPort}" + timeout = 240 environment = [ 'JAVA_OPTS' : "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}" - + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app" + + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app" + " -Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug" + " -Dorg.slf4j.simpleLogger.defaultLogLevel=debug" + " -Dconfig.file=${workingDir}/conf/application.conf -Dhttp.port=${playHttpPort}" diff --git a/dd-smoke-tests/springboot/springboot.gradle b/dd-smoke-tests/springboot/springboot.gradle index e5bfaffb96..04c2ecab8f 100644 --- a/dd-smoke-tests/springboot/springboot.gradle +++ b/dd-smoke-tests/springboot/springboot.gradle @@ -48,6 +48,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) { standardOutput "${buildDir}/reports/server.log" waitForPort = springbootHttpPort waitForOutput = "datadog.smoketest.springboot.SpringbootApplication - Started SpringbootApplication" + timeout = 240 stopAfter = test } diff --git a/dd-smoke-tests/wildfly/wildfly.gradle b/dd-smoke-tests/wildfly/wildfly.gradle index 8f3f6a7625..e9f2f2638e 100644 --- a/dd-smoke-tests/wildfly/wildfly.gradle +++ b/dd-smoke-tests/wildfly/wildfly.gradle @@ -72,6 +72,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) { // these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput waitForPort = wildflyHttpPort waitForOutput = "Undertow HTTP listener default listening on 127.0.0.1:${wildflyHttpPort}" + timeout = 240 environment = [ 'JAVA_OPTS': "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}" + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app"