From be73916330fd95330ac6c9c3f6d5077b4e9affbd Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <kirill.likhodedov@jetbrains.com>
Date: Mon, 31 May 2010 18:17:05 +0400
Subject: [PATCH] Merge. don't run HgExecutableValidator in unit test mode

---
 plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
index 75e93431f2f2..da2c5089f196 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
@@ -13,6 +13,7 @@
 package org.zmlx.hg4idea;
 
 import com.intellij.concurrency.*;
+import com.intellij.openapi.application.*;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.options.*;
 import com.intellij.openapi.project.*;
@@ -212,8 +213,12 @@ public class HgVcs extends AbstractVcs {
 
   @Override
   protected void start() throws VcsException {
-    HgExecutableValidator validator = new HgExecutableValidator(myProject);
-    started = validator.check(globalSettings);
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      started = true;
+    } else {
+      HgExecutableValidator validator = new HgExecutableValidator(myProject);
+      started = validator.check(globalSettings);
+    }
   }
 
   @Override