Skip to content

Commit 89de4b3

Browse files
committed
Renamed addCrashTracking to testCrashTracking for consistency
Renamed addCrashTracking to testCrashTracking for consistency with recently added testTelemetry
1 parent fbe2772 commit 89de4b3

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastServerSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ abstract class AbstractIastServerSmokeTest extends AbstractServerSmokeTest {
2323
private final JsonSlurper jsonSlurper = new JsonSlurper()
2424

2525
@Override
26-
def addCrashTracking() {
26+
def testCrashTracking() {
2727
// DQH - 2024 Nov
2828
// Disabled crash tracking in IAST tests for initial GA
2929
// NOTE: That tests that concatenate JVM arguments into JAVA_TOOL_OPTIONS may

dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {
2020
String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path")
2121

2222
@Override
23-
def addCrashTracking() {
23+
def testCrashTracking() {
2424
// DQH - 2024 Nov
2525
// Concatenating into a single string to use JAVA_TOOL_OPTIONS doesn't play nice
26-
// with the quote currently used by crash tracking smoke testing in AbstractSmokeTest,
26+
// with the quoting currently used by crash tracking smoke testing in AbstractSmokeTest,
2727
// so skipping for this test.
2828
return false
2929
}

dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest {
2020
String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path")
2121

2222
@Override
23-
def addCrashTracking() {
23+
def testCrashTracking() {
2424
// DQH - 2024 Nov
2525
// Concatenating into a single string to use JAVA_TOOL_OPTIONS doesn't play nice
26-
// with the quote currently used by crash tracking smoke testing in AbstractSmokeTest,
26+
// with the quoting currently used by crash tracking smoke testing in AbstractSmokeTest,
2727
// so skipping for this test.
2828
return false
2929
}

dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTes
2222
String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path")
2323

2424
@Override
25-
def addCrashTracking() {
25+
def testCrashTracking() {
2626
// DQH - 2024 Nov
2727
// Concatenating into a single string to use JAVA_TOOL_OPTIONS doesn't play nice
28-
// with the quote currently used by crash tracking smoke testing in AbstractSmokeTest,
28+
// with the quoting currently used by crash tracking smoke testing in AbstractSmokeTest,
2929
// so skipping for this test.
3030
return false
3131
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ abstract class AbstractSmokeTest extends ProcessManager {
164164
"-Ddd.version=${VERSION}"
165165
]
166166

167-
def addCrashTracking() {
167+
def testCrashTracking() {
168168
return true
169169
}
170170

@@ -194,9 +194,8 @@ abstract class AbstractSmokeTest extends ProcessManager {
194194
ret += "-Ddd.service.name=${SERVICE_NAME}"
195195
}
196196

197-
// DQH - 13 Nov 2024 - Crashtracking bash script doesn't work on OS X,
198-
// so skipping crash tracking on OS X
199-
if (addCrashTracking() && !Platform.isJ9() && !Platform.isMac()) {
197+
// DQH - Nov 2024 - skipping for J9 which doesn't have full crash tracking support
198+
if (testCrashTracking() && !Platform.isJ9()) {
200199
def extension = getScriptExtension()
201200

202201
ret += "-XX:OnError=\"${tmpDir}/dd_crash_uploader.${extension} %p\""

dd-smoke-tests/vertx-3.4/src/test/groovy/datadog/smoketest/VertxSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class VertxSmokeTest extends AbstractServerSmokeTest {
1414
int totalInvocations = 1000
1515

1616
@Override
17-
def addCrashTracking() {
17+
def testCrashTracking() {
1818
// DQH - 2024 Nov
1919
// Disabled crash tracking in IAST tests for initial GA
2020
// NOTE: That tests that concatenate JVM arguments into JAVA_TOOL_OPTIONS may

0 commit comments

Comments
 (0)