From cb33a0bd50f447f7dd2accf5e5bd00f5008f4cde Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 30 Mar 2012 18:34:00 +0400 Subject: [PATCH] Fix GitBranchOperationsTest Update all repositories initially and after checkout. --- .../tests/git4idea/branch/GitBranchOperationsTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java index 821f6fa05353..a26cbfd47c8b 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java @@ -97,6 +97,7 @@ public class GitBranchOperationsTest extends AbstractVcsTestCase { createAddCommit(myContrib, "a"); myUltimate.getRoot().refresh(false, true); + updateRepositories(); } protected void doActionSilently(final VcsConfiguration.StandardConfirmation op) { @@ -314,6 +315,13 @@ public class GitBranchOperationsTest extends AbstractVcsTestCase { }); doCheckoutOrMerge(checkout, "feature"); + updateRepositories(); + } + + private void updateRepositories() { + myUltimate.update(GitRepository.TrackedTopic.ALL); + myCommunity.update(GitRepository.TrackedTopic.ALL); + myContrib.update(GitRepository.TrackedTopic.ALL); } @Test