From 8a0bd9446b2419ea3f0d04f6c1c27977152f1d21 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Fri, 26 Feb 2016 20:11:18 +0300
Subject: [PATCH] Minor: remove duplicated daemon stop in tests

KT-8487
---
 .../KotlinGradlePluginParametrizedIT.kt       | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt
index 546ac5cf602..c8142b6de8c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt
@@ -16,13 +16,7 @@ class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() {
 
     @Test
     fun testFromJps() {
-        try {
-            JpsTestProject(jpsResourcesPath, relativePath).performAndAssertBuildStages(weakTesting = true)
-        }
-        finally {
-            if (defaultBuildOptions().withDaemon)
-                checkRecycleDaemon()
-        }
+        JpsTestProject(jpsResourcesPath, relativePath).performAndAssertBuildStages(weakTesting = true)
     }
 
     override fun defaultBuildOptions(): BuildOptions = BuildOptions(withDaemon = true)
@@ -35,9 +29,6 @@ class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() {
                                         File(jpsResourcesPath, "custom"),
                                         File(jpsResourcesPath, "lookupTracker"))
 
-        val MAX_TESTS_ON_SINGLE_DAEMON = 20
-        private var testsCounter = 0
-
         @Suppress("unused")
         @Parameterized.Parameters(name = "{index}: {0}")
         @JvmStatic
@@ -47,14 +38,6 @@ class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() {
                         .filter { it.isDirectory && isJpsTestProject(it) }
                         .map { arrayOf(it.toRelativeString(jpsResourcesPath)) }
                         .toList()
-
-        @Synchronized
-        fun checkRecycleDaemon() {
-            if (testsCounter++ > MAX_TESTS_ON_SINGLE_DAEMON) {
-                BaseGradleIT.tearDownAll()
-                testsCounter = 0
-            }
-        }
     }
 }