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 datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.AgentLoadedChecker import jvmbootstraptest.AgentLoadedChecker
import spock.lang.Specification import spock.lang.Specification
import spock.lang.Timeout
@Timeout(30)
class AgentLoadedIntoBootstrapTest extends Specification { class AgentLoadedIntoBootstrapTest extends Specification {
def "Agent loads in when separate jvm is launched"() { 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 jvmbootstraptest.LogManagerSetter
import spock.lang.Requires import spock.lang.Requires
import spock.lang.Specification 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 // 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") }) @Requires({ !System.getProperty("java.vm.name").contains("IBM J9 VM") })
class CustomLogManagerTest extends Specification { 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.Rule
import org.junit.contrib.java.lang.system.RestoreSystemProperties import org.junit.contrib.java.lang.system.RestoreSystemProperties
import spock.lang.Specification import spock.lang.Specification
import spock.lang.Timeout
import java.lang.reflect.Method import java.lang.reflect.Method
@Timeout(30)
class JMXFetchTest extends Specification { class JMXFetchTest extends Specification {
@Rule @Rule

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

@ -1,11 +1,11 @@
package datadog.trace.agent package datadog.trace.agent
import datadog.trace.agent.test.IntegrationTestUtils import datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.LogLevelChecker import jvmbootstraptest.LogLevelChecker
import spock.lang.Specification import spock.lang.Specification
import spock.lang.Timeout
@Timeout(30)
class LogLevelTest extends Specification { class LogLevelTest extends Specification {
@ -22,6 +22,7 @@ class LogLevelTest extends Specification {
, [:] , [:]
, true) == 1 , true) == 1
} }
def "SLF4J DEBUG && dd.trace.debug is false"() { def "SLF4J DEBUG && dd.trace.debug is false"() {
expect: expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName() IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
@ -30,6 +31,7 @@ class LogLevelTest extends Specification {
, [:] , [:]
, true) == 0 , true) == 0
} }
def "dd.trace.debug is false && DD_TRACE_DEBUG is true"() { def "dd.trace.debug is false && DD_TRACE_DEBUG is true"() {
expect: expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName() IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()
@ -68,7 +70,6 @@ class LogLevelTest extends Specification {
} }
def "SLF4J DEBUG && DD_TRACE_DEBUG is false"() { def "SLF4J DEBUG && DD_TRACE_DEBUG is false"() {
expect: expect:
IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName() IntegrationTestUtils.runOnSeparateJvm(LogLevelChecker.getName()

4
gradle/java.gradle
View File

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