open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set timeouts on individual tests and increase overall test timeout.

This commit is contained in:
Tyler Benson 2020-01-21 08:29:48 -08:00
parent b7d599d82f
commit f9e43516ad
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/src/test/groovy/datadog/trace/agent/AgentLoadedIntoBootstrapTest.groovy
View File

@ -3,7 +3,9 @@ package datadog.trace.agent
import datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.AgentLoadedChecker
import spock.lang.Specification
import spock.lang.Timeout
@Timeout(30)
class AgentLoadedIntoBootstrapTest extends Specification {
def "Agent loads in when separate jvm is launched"() {

2
dd-java-agent/src/test/groovy/datadog/trace/agent/CustomLogManagerTest.groovy
View File

@ -4,7 +4,9 @@ import datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.LogManagerSetter
import spock.lang.Requires
import spock.lang.Specification
import spock.lang.Timeout
@Timeout(30)
// Note: this test is fails on IBM JVM, we would need to investigate this at some point
@Requires({ !System.getProperty("java.vm.name").contains("IBM J9 VM") })
class CustomLogManagerTest extends Specification {

2
dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy
View File

@ -6,9 +6,11 @@ import jvmbootstraptest.AgentLoadedChecker
import org.junit.Rule
import org.junit.contrib.java.lang.system.RestoreSystemProperties
import spock.lang.Specification
import spock.lang.Timeout
import java.lang.reflect.Method
@Timeout(30)
class JMXFetchTest extends Specification {
@Rule

23
dd-java-agent/src/test/groovy/datadog/trace/agent/LogLevelTest.groovy
View File

@ -1,11 +1,11 @@
package datadog.trace.agent
import datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.LogLevelChecker
import spock.lang.Specification
import spock.lang.Timeout
@Timeout(30)
class LogLevelTest extends Specification {
@ -17,23 +17,25 @@ class LogLevelTest extends Specification {
def "dd.trace.debug false"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.trace.debug=false","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.trace.debug=false", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, [:]
, true) == 1
}
def "SLF4J DEBUG && dd.trace.debug is false"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.trace.debug=false","-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.trace.debug=false", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, [:]
, true) == 0
}
def "dd.trace.debug is false && DD_TRACE_DEBUG is true"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.trace.debug=false","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.trace.debug=false", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, ["DD_TRACE_DEBUG": "true"]
, true) == 1
@ -42,7 +44,7 @@ class LogLevelTest extends Specification {
def "dd.trace.debug is true"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.trace.debug=true","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.trace.debug=true", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, [:]
, true) == 0
@ -52,7 +54,7 @@ class LogLevelTest extends Specification {
def "DD_TRACE_DEBUG is true"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, ["DD_TRACE_DEBUG": "true"]
, true) == 0
@ -61,18 +63,17 @@ class LogLevelTest extends Specification {
def "dd.trace.debug is true && DD_TRACE_DEBUG is false"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddd.trace.debug=true","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddd.trace.debug=true", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, ["DD_TRACE_DEBUG": "false"]
, true) == 0
}
def "SLF4J DEBUG && DD_TRACE_DEBUG is false"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, ["DD_TRACE_DEBUG": "false"]
, true) == 0
@ -81,7 +82,7 @@ class LogLevelTest extends Specification {
def "SLF4J INFO && DD_TRACE_DEBUG is true"() {
expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
, ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info","-Ddd.jmxfetch.enabled=false","-Ddd.trace.enabled=false"] as String[]
, ["-Ddatadog.slf4j.simpleLogger.defaultLogLevel=info", "-Ddd.jmxfetch.enabled=false", "-Ddd.trace.enabled=false"] as String[]
, "" as String[]
, ["DD_TRACE_DEBUG": "true"]
, true) == 1

4
gradle/java.gradle
View File

@ -332,8 +332,8 @@ for (def env : System.getenv().entrySet()) {
}
tasks.withType(Test).configureEach {
// All tests must complete within 2 minutes.
timeout = Duration.ofMinutes(2)
// All tests must complete within 3 minutes.
timeout = Duration.ofMinutes(3)
// Disable all tests if skipTests property was specified
onlyIf { !project.rootProject.hasProperty("skipTests") }