From 4f360f2e095f5ec5eaac3d4a069e03b7201e3f03 Mon Sep 17 00:00:00 2001
From: Vamshi Vijay Nakkirtha <46505183+vamshin@users.noreply.github.com>
Date: Tue, 9 Jun 2020 13:53:49 -0700
Subject: [PATCH] fix coverage issue (#134)

* fix coverage issue

* revert jni lib change
---
 build-tools/knnplugin-coverage.gradle | 26 +++++++++++---------
 build.gradle                          | 34 ++++-----------------------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/build-tools/knnplugin-coverage.gradle b/build-tools/knnplugin-coverage.gradle
index a2f6d71a..058ea4c2 100644
--- a/build-tools/knnplugin-coverage.gradle
+++ b/build-tools/knnplugin-coverage.gradle
@@ -55,15 +55,6 @@ integTest.runner {
     systemProperty 'jacoco.dir', "${jacocoDir}"
 }
 
-testClusters.integTest {
-    jvmArgs " ${dummyIntegTest.jacoco.getAsJvmArg()}"
-    systemProperty 'com.sun.management.jmxremote', "true"
-    systemProperty 'com.sun.management.jmxremote.authenticate', "false"
-    systemProperty 'com.sun.management.jmxremote.port', "7777"
-    systemProperty 'com.sun.management.jmxremote.ssl', "false"
-    systemProperty 'java.rmi.server.hostname', "127.0.0.1"
-}
-
 jacocoTestReport {
     dependsOn integTest, test
     executionData.from = [dummyTest.jacoco.destinationFile, dummyIntegTest.jacoco.destinationFile]
@@ -77,6 +68,19 @@ jacocoTestReport {
     }
 }
 
-project.gradle.projectsEvaluated {
-    jacocoTestReport.dependsOn integTest.runner
+
+allprojects{
+    afterEvaluate {
+        jacocoTestReport.dependsOn integTest.runner
+
+        testClusters.integTest {
+            jvmArgs " ${dummyIntegTest.jacoco.getAsJvmArg()}"
+            systemProperty 'com.sun.management.jmxremote', "true"
+            systemProperty 'com.sun.management.jmxremote.authenticate', "false"
+            systemProperty 'com.sun.management.jmxremote.port', "7777"
+            systemProperty 'com.sun.management.jmxremote.ssl', "false"
+            systemProperty 'java.rmi.server.hostname', "127.0.0.1"
+        }
+    }
 }
+
diff --git a/build.gradle b/build.gradle
index 58e83e4b..2fbb643b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,9 +46,14 @@ plugins {
 apply plugin: 'elasticsearch.esplugin'
 
 def usingRemoteCluster = System.properties.containsKey('tests.rest.cluster') || System.properties.containsKey('tests.cluster')
+def usingMultiNode = project.properties.containsKey('numNodes')
+// Only apply jacoco test coverage if we are running a local single node cluster
 def integTestDependOnJniLib = false
 if (!usingRemoteCluster) {
     integTestDependOnJniLib = true
+    if (!usingMultiNode) {
+        apply from: 'build-tools/knnplugin-coverage.gradle'
+    }
 }
 
 ext {
@@ -74,35 +79,6 @@ jacoco {
     toolVersion = "0.8.5"
 }
 
-jacocoTestReport {
-    reports {
-        xml.enabled false
-        csv.enabled false
-    }
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it)
-        }))
-    }
-}
-test.finalizedBy(project.tasks.jacocoTestReport)
-jacocoTestCoverageVerification {
-    violationRules {
-        rule {
-            limit {
-                minimum = 0.5
-            }
-
-        }
-    }
-    afterEvaluate {
-        classDirectories.setFrom(files(classDirectories.files.collect {
-            fileTree(dir: it)
-        }))
-    }
-}
-check.dependsOn jacocoTestCoverageVerification
-
 check.dependsOn jacocoTestReport
 
 esplugin {