diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java index 71fbfe242310..4c7503f52c6f 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java @@ -59,13 +59,13 @@ public abstract class HgPlatformTest extends VcsPlatformTest { super.setUp(); cd(myProjectRoot); - hg("version"); - - createRepository(myProjectRoot); myVcs = HgVcs.getInstance(myProject); assertNotNull(myVcs); myVcs.getGlobalSettings().setHgExecutable(HgExecutor.getHgExecutable()); + myVcs.getProjectSettings().setCheckIncomingOutgoing(false); myVcs.checkVersion(); + hg("version"); + createRepository(myProjectRoot); myRepository = myProjectRoot; setUpHgrc(myRepository); } diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java index 64b62f043f8e..a799af1d70a6 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java @@ -58,6 +58,9 @@ public class HgTaskBranchesTest extends TaskBranchesTest { hg("commit -m another -u abc"); hg("up -r 0"); ProjectLevelVcsManagerImpl vcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject); + HgVcs hgVcs = HgVcs.getInstance(myProject); + assert hgVcs != null; + hgVcs.getProjectSettings().setCheckIncomingOutgoing(false); vcsManager.setDirectoryMapping(root, HgVcs.VCS_NAME); VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(new File(root)); HgRepository repository = HgUtil.getRepositoryManager(myProject).getRepositoryForRoot(file); @@ -86,6 +89,5 @@ public class HgTaskBranchesTest extends TaskBranchesTest { return ((HgRepository)repository).getOpenedBranches().size() + ((HgRepository)repository).getBookmarks().size(); } - }