Skip to content

Commit d7515c8

Browse files
daniel-mohedanodevflow.devflow-routing-intake
andauthored
fix: skip 'test_maven_build_with_unit_and_integration_tests_generates_spans' (#10657)
fix: skip 'test_maven_build_with_unit_and_integration_tests_generates_spans' Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 21795b3 commit d7515c8

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ muzzle {
1111

1212
addTestSuiteForDir('latestDepTest', 'test')
1313

14+
tasks.named("latestDepTest", Test) {
15+
systemProperty 'test.isLatestDepTest', 'true'
16+
}
17+
1418
dependencies {
1519
compileOnly 'org.apache.maven:maven-embedder:3.2.1'
1620

dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import java.nio.file.Path
88
import java.nio.file.Paths
99

1010
import static org.junit.jupiter.api.Assertions.assertEquals
11+
import static org.junit.jupiter.api.Assumptions.abort
1112

1213
class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
1314

@@ -31,6 +32,10 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
3132
}
3233

3334
def "test #testcaseName"() {
35+
if (skipLatest && Boolean.getBoolean("test.isLatestDepTest")) {
36+
abort("Skipping latest dep test")
37+
}
38+
3439
String workingDirectory = projectFolder.toString()
3540

3641
def exitCode = new MavenCli().doMain(args.toArray(new String[0]), workingDirectory, null, null)
@@ -39,15 +44,15 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
3944
assertSpansData(testcaseName)
4045

4146
where:
42-
testcaseName | args | expectedExitCode
43-
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0
44-
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1
45-
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0
46-
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1
47-
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1
48-
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0
49-
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0
50-
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0
47+
testcaseName | args | expectedExitCode | skipLatest
48+
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0 | false
49+
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1 | false
50+
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0 | false
51+
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1 | false
52+
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1 | false
53+
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0 | false
54+
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0 | true // temporary workaround to avoid failures with maven-failsafe-plugin 3.5.5
55+
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0 | false
5156
}
5257

5358
private void givenMavenProjectFiles(String projectFilesSources) {

0 commit comments

Comments
 (0)