Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2016-01-07 15:55:42 +0000
committerAndrey Loskutov2016-01-07 18:28:43 +0000
commit7a4ed471dd4c15283959ff383e1949c4ab2c92b4 (patch)
tree5c2c0bf2e2f9a11dd4e055e0faf8160c024e26d3 /org.eclipse.egit.core.test
parentc48fcea1d56d36b92ffdb95e6adcf7ee071bb137 (diff)
downloadegit-7a4ed471dd4c15283959ff383e1949c4ab2c92b4.tar.gz
egit-7a4ed471dd4c15283959ff383e1949c4ab2c92b4.tar.xz
egit-7a4ed471dd4c15283959ff383e1949c4ab2c92b4.zip
[test stability] trying to stabilize recently failed unstable tests
Change-Id: Ibf8298ebd16ec55a7320aeef5303b6006432f8ca Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java11
1 files changed, 9 insertions, 2 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);

Back to the top