From 2bf22caeb7c687cd6b54b05b11e5c0f1a3caa07c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 4 Dec 2020 13:57:16 +0300 Subject: [PATCH] Revert "Keep application environment alive between JPS tests" This reverts commit 175dd567 The revert fixes the flaky behaviour on Windows in jps-plugin tests. java.lang.RuntimeException: java.nio.file.FileSystemException: tempdir_path\jps-build\jslib-example.jar: The process cannot access the file because it is being used by another process. Can be reproduced when running KotlinJpsBuildTest after IncrementalJsJpsTestGenerated. 1. IncrementalJsJpsTestGenerated sets KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY 2. KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY disables environment clean-up. 3. No disposeApplicationEnvironment() call also means no ZipHandler.clearFileAccessorCache() 4. There's jslib-example.jar opening in JsConfig.checkLibFilesAndReportErrors() 5. File handler is not closed and tests fails in tearDown() Affected tests: KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryCustomOutputDir KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryAndErrors KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibrary KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryNoCopy KotlinJpsBuildTest.testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryCustomOutputDir KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryAndErrors KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibrary KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryNoCopy KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 -- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 | 2 -- 2 files changed, 4 deletions(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index e5144af90b6..d3b89fa9b2f 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -43,7 +43,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.incremental.LookupSymbol @@ -128,7 +127,6 @@ abstract class AbstractIncrementalJpsTest( enableICFixture.setUp() lookupsDuringTest = hashSetOf() - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 53c501a11f0..1d20b2e2a4d 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -43,7 +43,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.incremental.LookupSymbol @@ -128,7 +127,6 @@ abstract class AbstractIncrementalJpsTest( enableICFixture.setUp() lookupsDuringTest = hashSetOf() - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") if (DEBUG_LOGGING_ENABLED) { enableDebugLogging()