File tree 3 files changed +16
-4
lines changed
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base
dd-smoke-tests/custom-systemloader/src/test/groovy/datadog/smoketest
utils/test-utils/src/main/groovy/datadog/trace/test/util
3 files changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -1748,6 +1748,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
1748
1748
requestBodyNoStreaming ? IG_BODY_CONVERTED_HEADER : IG_BODY_END_BLOCK_HEADER
1749
1749
}
1750
1750
1751
+ @Flaky (value = " APPSEC-56822" , suites = [" PlayScalaAsyncServerTest" ])
1751
1752
def ' user blocking' () {
1752
1753
setup :
1753
1754
assumeTrue(testUserBlocking())
Original file line number Diff line number Diff line change 1
1
package datadog.smoketest
2
2
3
+ import datadog.trace.test.util.Flaky
4
+ import datadog.trace.test.util.Predicates.IBM
5
+
3
6
import static java.util.concurrent.TimeUnit.SECONDS
4
7
5
8
class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
@@ -27,6 +30,7 @@ class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
27
30
return processBuilder
28
31
}
29
32
33
+ @Flaky (value = ' Race condition with IMB. Check APMAPI-1194' , condition = IBM )
30
34
def " resource types loaded by custom system class-loader are transformed" () {
31
35
when :
32
36
testedProcess. waitFor(TIMEOUT_SECS , SECONDS )
Original file line number Diff line number Diff line change @@ -7,14 +7,21 @@ public abstract class Predicates {
7
7
8
8
private Predicates () {}
9
9
10
- public static final class IBM8 implements Predicate <String > {
11
- private static final String VENDOR_STRING = "IBM" ;
10
+ public static class IBM implements Predicate <String > {
11
+ private static final String IBM_VENDOR_STRING = "IBM" ;
12
+
13
+ @ Override
14
+ public boolean test (String s ) {
15
+ return System .getProperty ("java.vendor" , "" ).contains (IBM_VENDOR_STRING );
16
+ }
17
+ }
18
+
19
+ public static final class IBM8 extends IBM {
12
20
private static final BigDecimal VERSION = new BigDecimal ("1.8" );
13
21
14
22
@ Override
15
23
public boolean test (final String spec ) {
16
- final String vendor = System .getProperty ("java.vendor" , "" );
17
- if (!vendor .contains (VENDOR_STRING )) {
24
+ if (!super .test (spec )) {
18
25
return false ;
19
26
}
20
27
final BigDecimal version =
You can’t perform that action at this time.
0 commit comments