azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove internal jdk to fix flaky MavenUpdateConfigurationQuickFixTest

Browse Source
This commit is contained in:
Nikolay Krasko
2019-07-16 00:26:20 +03:00
parent 6176373713
commit d3bc2ec855
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java
+1
View File
@@ -85,6 +85,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
try { try {
JavaAwareProjectJdkTableImpl.removeInternalJdkInTests();
if (myGlobalSettingsFile != null) { if (myGlobalSettingsFile != null) {
VfsRootAccess.disallowRootAccess(myGlobalSettingsFile.getAbsolutePath()); VfsRootAccess.disallowRootAccess(myGlobalSettingsFile.getAbsolutePath());
} }
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java.182
+1
View File
@@ -86,6 +86,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
try { try {
JavaAwareProjectJdkTableImpl.removeInternalJdkInTests();
if (myGlobalSettingsFile != null) { if (myGlobalSettingsFile != null) {
VfsRootAccess.disallowRootAccess(myGlobalSettingsFile.getAbsolutePath()); VfsRootAccess.disallowRootAccess(myGlobalSettingsFile.getAbsolutePath());
} }