[test stability] trying to stabilize recently failed unstable tests

Change-Id: Ibf8298ebd16ec55a7320aeef5303b6006432f8ca
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

2 files changed, 14 insertions, 4 deletions

diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
index 24e32905a9..d45d6f8cd4 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
@@ -9,11 +9,11 @@
  *******************************************************************************/
 package org.eclipse.egit.core.synchronize;
 
-import static org.junit.Assert.assertTrue;
 import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.util.LinkedHashSet;
@@ -370,10 +370,17 @@ public class GitSubscriberMergeContextTest extends ModelTestCase {
 		setContentsAndCommit(testRepo, iFile1, branchChanges + initialContent1,
 				"branch commit");
 		iFile2.delete(true, new NullProgressMonitor());
+		testUtils.waitForJobs(500, 5000, null);
+		assertFalse(iFile2.exists());
+
 		testRepo.addAndCommit(iProject, file2, "branch commit - deleted file2."
 				+ SAMPLE_FILE_EXTENSION);
 
 		testRepo.checkoutBranch(MASTER);
+		iProject.refreshLocal(IResource.DEPTH_INFINITE,
+				new NullProgressMonitor());
+		testUtils.waitForJobs(500, 5000, null);
+		assertTrue(iFile2.exists());
 
 		final String masterChanges = "some changes\n";
 		setContentsAndCommit(testRepo, iFile1, initialContent1 + masterChanges,
@@ -381,7 +388,7 @@ public class GitSubscriberMergeContextTest extends ModelTestCase {
 		iProject.refreshLocal(IResource.DEPTH_INFINITE,
 				new NullProgressMonitor());
 		// end setup
-
+		testUtils.waitForJobs(500, 5000, null);
 		IMergeContext mergeContext = prepareModelContext(repo, iFile1, MASTER,
 				BRANCH);
 		IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/DisconnectConnectTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/DisconnectConnectTest.java
index 9d5f8ca8bb..cc2fd3e272 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/DisconnectConnectTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/DisconnectConnectTest.java
@@ -49,7 +49,7 @@ public class DisconnectConnectTest extends LocalRepositoryTestCase {
 		clickOnDisconnect();
 		ResourcesPlugin.getWorkspace().getRoot().refreshLocal(
 				IResource.DEPTH_INFINITE, null);
-		waitInUI();
+		TestUtil.waitForJobs(500, 5000);
 		mapping = RepositoryMapping.getMapping(project);
 		assertNull(mapping);
 		SWTBotShell connectDialog = openConnectDialog();
@@ -61,8 +61,11 @@ public class DisconnectConnectTest extends LocalRepositoryTestCase {
 		connectDialog.bot().button(IDialogConstants.FINISH_LABEL).click();
 		ResourcesPlugin.getWorkspace().getRoot().refreshLocal(
 				IResource.DEPTH_INFINITE, null);
-		waitInUI();
+		TestUtil.waitForJobs(500, 5000);
 		mapping = RepositoryMapping.getMapping(project);
+		if (mapping == null) {
+			TestUtil.waitForJobs(500, 5000);
+		}
 		assertNotNull(mapping);
 	}