From ae05c04d982a77bb0a29f4c03f76eb8d42294326 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 25 Dec 2015 20:01:39 +0300 Subject: [PATCH] Update maven test: shutdown maven process --- .../org/jetbrains/kotlin/idea/maven/MavenTestCase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/maven/MavenTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/maven/MavenTestCase.java index 20ee6776a5f..95552945f7a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/maven/MavenTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/maven/MavenTestCase.java @@ -41,6 +41,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.indices.MavenIndicesManager; import org.jetbrains.idea.maven.project.*; +import org.jetbrains.idea.maven.server.MavenServerManager; import org.jetbrains.idea.maven.utils.MavenProgressIndicator; import java.awt.*; @@ -50,6 +51,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; import java.util.List; +import java.util.concurrent.TimeUnit; public abstract class MavenTestCase extends UsefulTestCase { protected static final MavenConsole NULL_MAVEN_CONSOLE = new NullMavenConsole(); @@ -142,6 +144,8 @@ public abstract class MavenTestCase extends UsefulTestCase { @Override protected void tearDown() throws Exception { try { + MavenServerManager.getInstance().shutdown(true); + MavenArtifactDownloader.awaitQuiescence(100, TimeUnit.SECONDS); myProject = null; UIUtil.invokeAndWaitIfNeeded(new Runnable() { @Override @@ -324,7 +328,7 @@ public abstract class MavenTestCase extends UsefulTestCase { String mirror = System.getProperty("idea.maven.test.mirror", // use JB maven proxy server for internal use by default, see details at // https://confluence.jetbrains.com/display/JBINT/Maven+proxy+server - "http://maven.labs.intellij.net/repo"); + "http://maven.labs.intellij.net/repo1"); return "" + content + "" +