Update maven test: shutdown maven process
This commit is contained in:
@@ -41,6 +41,7 @@ import org.jetbrains.annotations.NonNls;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.idea.maven.indices.MavenIndicesManager;
|
import org.jetbrains.idea.maven.indices.MavenIndicesManager;
|
||||||
import org.jetbrains.idea.maven.project.*;
|
import org.jetbrains.idea.maven.project.*;
|
||||||
|
import org.jetbrains.idea.maven.server.MavenServerManager;
|
||||||
import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
|
import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
@@ -50,6 +51,7 @@ import java.lang.reflect.Field;
|
|||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public abstract class MavenTestCase extends UsefulTestCase {
|
public abstract class MavenTestCase extends UsefulTestCase {
|
||||||
protected static final MavenConsole NULL_MAVEN_CONSOLE = new NullMavenConsole();
|
protected static final MavenConsole NULL_MAVEN_CONSOLE = new NullMavenConsole();
|
||||||
@@ -142,6 +144,8 @@ public abstract class MavenTestCase extends UsefulTestCase {
|
|||||||
@Override
|
@Override
|
||||||
protected void tearDown() throws Exception {
|
protected void tearDown() throws Exception {
|
||||||
try {
|
try {
|
||||||
|
MavenServerManager.getInstance().shutdown(true);
|
||||||
|
MavenArtifactDownloader.awaitQuiescence(100, TimeUnit.SECONDS);
|
||||||
myProject = null;
|
myProject = null;
|
||||||
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
|
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -324,7 +328,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
|
|||||||
String mirror = System.getProperty("idea.maven.test.mirror",
|
String mirror = System.getProperty("idea.maven.test.mirror",
|
||||||
// use JB maven proxy server for internal use by default, see details at
|
// use JB maven proxy server for internal use by default, see details at
|
||||||
// https://confluence.jetbrains.com/display/JBINT/Maven+proxy+server
|
// https://confluence.jetbrains.com/display/JBINT/Maven+proxy+server
|
||||||
"http://maven.labs.intellij.net/repo");
|
"http://maven.labs.intellij.net/repo1");
|
||||||
return "<settings>" +
|
return "<settings>" +
|
||||||
content +
|
content +
|
||||||
"<mirrors>" +
|
"<mirrors>" +
|
||||||
|
|||||||
Reference in New Issue
Block a user