diff --git a/plugins/git4idea/src/git4idea/roots/GitRootScanner.java b/plugins/git4idea/src/git4idea/roots/GitRootScanner.java index 226f8932b603..c14f276a4c22 100644 --- a/plugins/git4idea/src/git4idea/roots/GitRootScanner.java +++ b/plugins/git4idea/src/git4idea/roots/GitRootScanner.java @@ -17,6 +17,7 @@ package git4idea.roots; import com.intellij.ProjectTopics; import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootEvent; @@ -111,6 +112,11 @@ public class GitRootScanner implements BulkFileListener, ModuleRootListener, Dis } private void scheduleScan() { + if (ApplicationManager.getApplication().isUnitTestMode()) { + // don't scan in tests + return; + } + myAlarm.cancelAllRequests(); // one scan is enough, no need to queue, they all do the same myAlarm.addRequest(new Runnable() { @Override