Commit f9f0778

authored

Merge pull request DataDog#6316 from DataDog/revert-6254-multi-agent-no-protectiondomain-systemloader-smoke-test

Revert "Add smoke test for multiple agents and NoProtectionDomain system loader"

2 parents f4980d2 + cfe9f52 commit f9f0778Copy full SHA for f9f0778

File tree

7 files changed

-288

lines changed

dd-smoke-tests
- agent-bootstrap
  - build.gradle
  - src
    - another-agent/java/datadog/smoketest/agent
      - AnotherAgent.java
    - main/java/datadog/smoketest
      - app
        App.java
      - classloader
        NoProtectionDomainClassLoader.java
    - test/groovy/datadog/smoketest
      - MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy
- src/main/groovy/datadog/smoketest
  - ProcessManager.groovy
settings.gradle

7 files changed

-288

lines changed

`‎dd-smoke-tests/agent-bootstrap/build.gradle‎`

Lines changed: 0 additions & 40 deletions

This file was deleted.

`‎dd-smoke-tests/agent-bootstrap/src/another-agent/java/datadog/smoketest/agent/AnotherAgent.java‎`

Lines changed: 0 additions & 7 deletions

This file was deleted.

`‎dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/app/App.java‎`

Lines changed: 0 additions & 15 deletions

This file was deleted.

`‎dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/classloader/NoProtectionDomainClassLoader.java‎`

Lines changed: 0 additions & 156 deletions

This file was deleted.

`‎dd-smoke-tests/agent-bootstrap/src/test/groovy/datadog/smoketest/MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy‎`

Lines changed: 0 additions & 63 deletions

This file was deleted.

`‎dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy‎`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ abstract class ProcessManager extends Specification {`
`185`	`185`	`ProcessBuilder processBuilder = createProcessBuilder(idx)`
`186`	`186`
`187`	`187`
`188`		`- processBuilder.environment().put("JAVA_HOME", javaHome())`
	`188`	`+ processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home"))`
`189`	`189`	`processBuilder.environment().put("DD_API_KEY", apiKey())`
`190`	`190`
`191`	`191`	`processBuilder.redirectErrorStream(true)`
`@@ -200,11 +200,7 @@ abstract class ProcessManager extends Specification {`
`200`	`200`
`201`	`201`	`String javaPath() {`
`202`	`202`	`final String separator = System.getProperty("file.separator")`
`203`		`- return javaHome() + separator + "bin" + separator + "java"`
`204`		`- }`
`205`		`-`
`206`		`- String javaHome() {`
`207`		`- return System.getProperty("java.home")`
	`203`	`+ return System.getProperty("java.home") + separator + "bin" + separator + "java"`
`208`	`204`	`}`
`209`	`205`
`210`	`206`	`def cleanupSpec() {`

`‎settings.gradle‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ include ':utils:time-utils'`
`89`	`89`	`include ':utils:version-utils'`
`90`	`90`
`91`	`91`	`// smoke tests`
`92`		`-include ':dd-smoke-tests:agent-bootstrap'`
`93`	`92`	`include ':dd-smoke-tests:armeria-grpc'`
`94`	`93`	`include ':dd-smoke-tests:cli'`
`95`	`94`	`include ':dd-smoke-tests:custom-systemloader'`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f9f0778

File tree

7 files changed

7 files changed

`‎dd-smoke-tests/agent-bootstrap/build.gradle‎`

`‎dd-smoke-tests/agent-bootstrap/src/another-agent/java/datadog/smoketest/agent/AnotherAgent.java‎`

`‎dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/app/App.java‎`

`‎dd-smoke-tests/agent-bootstrap/src/main/java/datadog/smoketest/classloader/NoProtectionDomainClassLoader.java‎`

`‎dd-smoke-tests/agent-bootstrap/src/test/groovy/datadog/smoketest/MultiAgentWithNoProtectionDomainSystemLoaderSmokeTest.groovy‎`

`‎dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy‎`

`‎settings.gradle‎`

0 commit comments