From 6b6668826d2ef458dc34c01d7d4f8bd1dbc371aa Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 16 May 2019 12:44:20 -0400
Subject: [PATCH] Do not run smoke test servers when tests are disabled

Unfortunately Gradle seem to need some manual help to figure this one out.
---
 dd-smoke-tests/play/play.gradle             | 5 ++++-
 dd-smoke-tests/springboot/springboot.gradle | 3 +++
 dd-smoke-tests/wildfly/wildfly.gradle       | 9 +++++++++
 gradle/java.gradle                          | 8 +++-----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dd-smoke-tests/play/play.gradle b/dd-smoke-tests/play/play.gradle
index f671577c4f..999c8e7c85 100644
--- a/dd-smoke-tests/play/play.gradle
+++ b/dd-smoke-tests/play/play.gradle
@@ -78,7 +78,7 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
   waitForOutput = "Listening for HTTP on /127.0.0.1:${playHttpPort}"
   timeout = 240
   environment = [
-    'JAVA_OPTS' :  "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}"
+    'JAVA_OPTS': "-javaagent:${project(':dd-java-agent').tasks.shadowJar.archivePath}"
       + " -Ddd.writer.type=LoggingWriter" + " -Ddd.service.name=java-app"
       + " -Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug"
       + " -Dorg.slf4j.simpleLogger.defaultLogLevel=debug"
@@ -87,6 +87,9 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
   ]
 
   dependsOn 'stage'
+
+  // When tests are disabled this would still be run, so disable this manually
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.register("deletePIDFile") {
diff --git a/dd-smoke-tests/springboot/springboot.gradle b/dd-smoke-tests/springboot/springboot.gradle
index 04c2ecab8f..c9011fd0c1 100644
--- a/dd-smoke-tests/springboot/springboot.gradle
+++ b/dd-smoke-tests/springboot/springboot.gradle
@@ -50,6 +50,9 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
   waitForOutput = "datadog.smoketest.springboot.SpringbootApplication - Started SpringbootApplication"
   timeout = 240
   stopAfter = test
+
+  // When tests are disabled this would still be run, so disable this manually
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.withType(Test).configureEach {
diff --git a/dd-smoke-tests/wildfly/wildfly.gradle b/dd-smoke-tests/wildfly/wildfly.gradle
index e9f2f2638e..d6e7e0e745 100644
--- a/dd-smoke-tests/wildfly/wildfly.gradle
+++ b/dd-smoke-tests/wildfly/wildfly.gradle
@@ -50,6 +50,9 @@ tasks.register("unzip", Copy) {
   } else {
     throw new GradleException("Can't find server zip file that starts with: " + zipFileNamePrefix)
   }
+
+  // When tests are disabled this would still be run, so disable this manually
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
@@ -83,6 +86,9 @@ tasks.register("startServer", com.github.psxpaul.task.ExecFork) {
   ]
 
   dependsOn unzip
+
+  // When tests are disabled this would still be run, so disable this manually
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.register("stopWildfly", Exec) {
@@ -92,6 +98,9 @@ tasks.register("stopWildfly", Exec) {
   args = ["--connect", "--controller=localhost:${wildflyManagementPort}", "command=:shutdown"]
 
   dependsOn startServer
+
+  // When tests are disabled this would still be run, so disable this manually
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 tasks.withType(Test).configureEach {
diff --git a/gradle/java.gradle b/gradle/java.gradle
index a3f86c3cee..a0c1af6cf9 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -98,7 +98,7 @@ jar {
       "Implementation-Title": project.name,
       "Implementation-Version": project.version,
       "Implementation-Vendor": "Datadog",
-      "Implementation-URL" :"https://github.com/datadog/dd-trace-java",
+      "Implementation-URL": "https://github.com/datadog/dd-trace-java",
     )
   }
 }
@@ -302,10 +302,8 @@ for (def env : System.getenv().entrySet()) {
 }
 
 // Disable all tests if skipTests property was specified
-if (project.hasProperty("skipTests")) {
-  tasks.withType(Test).configureEach {
-    onlyIf { false }
-  }
+tasks.withType(Test).configureEach {
+  onlyIf { !project.rootProject.hasProperty("skipTests") }
 }
 
 plugins.withType(BasePlugin) {