Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2016-03-02 15:24:14 -0500
committerMatthias Sohn2016-03-02 16:16:30 -0500
commit3f18b3527b1628a021f72939c249304a4628b4ac (patch)
treed9ece6722b7b1f2b7588856f7d47b39ac8e10a22
parent1564e74398f0281674585a06e6ab330ca8f4d1de (diff)
downloadegit-3f18b3527b1628a021f72939c249304a4628b4ac.tar.gz
egit-3f18b3527b1628a021f72939c249304a4628b4ac.tar.xz
egit-3f18b3527b1628a021f72939c249304a4628b4ac.zip
Test stability: GitRepositoriesViewRepoDeletionTest
Must click the menu synchronously. Change-Id: I5dda8ddd48387670c36e12bd6057ac415cef2cc2 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
index 8f5342cf7..730b0739d 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
@@ -18,14 +18,12 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import org.eclipse.egit.core.internal.indexdiff.IndexDiffCache;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.JobFamilies;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.test.ContextMenuHelper;
-import org.eclipse.egit.ui.test.JobJoiner;
import org.eclipse.egit.ui.test.TestUtil;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.api.SubmoduleAddCommand;
@@ -145,12 +143,11 @@ public class GitRepositoriesViewRepoDeletionTest extends
assertHasRepo(repositoryFile);
SWTBotTree tree = getOrOpenView().bot().tree();
tree.getAllItems()[0].select();
- JobJoiner joiner = JobJoiner.startListening(
- JobFamilies.REPOSITORY_DELETE, 10, TimeUnit.SECONDS);
- ContextMenuHelper.clickContextMenu(tree, myUtil.getPluginLocalizedValue(
+ ContextMenuHelper.clickContextMenuSync(tree,
+ myUtil.getPluginLocalizedValue(
REMOVE_REPOSITORY_FROM_VIEW_CONTEXT_MENU_LABEL));
+ TestUtil.joinJobs(JobFamilies.REPOSITORY_DELETE);
refreshAndWait();
- joiner.join();
assertEmpty();
assertTrue(repositoryFile.exists());
assertTrue(

Back to the top