Skip to content

Commit b167050

Browse files
Started mock agent before smock app started to make sure that it will be present to accept traces.
1 parent 20abae4 commit b167050

7 files changed

Lines changed: 12 additions & 5 deletions

File tree

dd-smoke-tests/concurrent/java-21/src/test/groovy/datadog/smoketest/concurrent/VirtualThreadTest.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package datadog.smoketest.concurrent
22

3-
import datadog.trace.test.util.Flaky
4-
53
class VirtualThreadStartTest extends AbstractConcurrentTest {
64
@Override
75
protected List<String> getTestArguments() {
86
return ['virtualThreadStart']
97
}
108

11-
@Flaky("Sometimes fails on CI with: Condition not satisfied after 30.00 seconds and 31 attempts")
129
def 'test Thread.startVirtualThread() runnable'() {
1310
expect:
1411
receivedCorrectTrace()
@@ -57,7 +54,6 @@ class VirtualThreadSubmitRunnableTest extends AbstractConcurrentTest {
5754
return ['virtualThreadSubmitRunnable']
5855
}
5956

60-
@Flaky("Sometimes fails on CI with: Condition not satisfied after 30.00 seconds and 31 attempts")
6157
def 'test VirtualThread submit runnable'() {
6258
expect:
6359
receivedCorrectTrace()

dd-smoke-tests/kafka-2/src/test/groovy/IastKafka2SmokeTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ class IastKafka2SmokeTest extends AbstractIastServerSmokeTest {
1616

1717
@Override
1818
protected void beforeProcessBuilders() {
19+
super.beforeProcessBuilders()
20+
1921
embeddedKafka = new EmbeddedKafkaBroker(1, true)
2022
embeddedKafka.afterPropertiesSet()
2123
}

dd-smoke-tests/kafka-3/src/test/groovy/IastKafka3SmokeTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ class IastKafka3SmokeTest extends AbstractIastServerSmokeTest {
1616

1717
@Override
1818
protected void beforeProcessBuilders() {
19+
super.beforeProcessBuilders()
20+
1921
embeddedKafka = new EmbeddedKafkaBroker(1, true)
2022
embeddedKafka.afterPropertiesSet()
2123
}

dd-smoke-tests/spring-boot-rabbit/src/test/groovy/datadog/smoketest/SpringBootRabbitIntegrationTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class SpringBootRabbitIntegrationTest extends AbstractServerSmokeTest {
3030

3131
@Override
3232
void beforeProcessBuilders() {
33+
super.beforeProcessBuilders()
34+
3335
rabbitMQContainer = new RabbitMQContainer("rabbitmq:3.9.20-alpine")
3436
rabbitMQContainer.start()
3537
rabbitHost = rabbitMQContainer.getHost()

dd-smoke-tests/springboot-mongo/src/test/groovy/datadog/smoketest/SpringBootMongoIntegrationTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ class SpringBootMongoIntegrationTest extends AbstractServerSmokeTest {
2323

2424
@Override
2525
void beforeProcessBuilders() {
26+
super.beforeProcessBuilders()
27+
2628
mongoDbContainer = new MongoDBContainer(DockerImageName.parse("mongo:4.4.29"))
2729
mongoDbContainer.start()
2830
mongoDbUri = mongoDbContainer.replicaSetUrl

dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ class SpringBootTomcatSmokeTest extends AbstractServerSmokeTest {
1919

2020
@Override
2121
protected void beforeProcessBuilders() {
22+
super.beforeProcessBuilders()
23+
2224
try {
2325
def catalinaPath = tomcatDirectory.resolve("bin/catalina.sh")
2426
def permissions = new HashSet<>(Files.getPosixFilePermissions(catalinaPath))

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ abstract class AbstractSmokeTest extends ProcessManager {
287287
}
288288
}
289289

290-
def setupSpec() {
290+
@Override
291+
protected void beforeProcessBuilders() {
291292
startServer()
292293
}
293294

0 commit comments

Comments
 (0)