Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-08-23 17:13:26 +0000
committerAndrey Loskutov2015-08-23 17:13:26 +0000
commitcb6594c665a61a5d0c14c6456b196e71bca56ea6 (patch)
tree2fa40d37db7b9a4c903f16034381f9bcc3bb3534 /org.eclipse.egit.ui.test
parent67a39e4abfc418c48dd44e05eaee7c7b1fb43e95 (diff)
downloadegit-cb6594c665a61a5d0c14c6456b196e71bca56ea6.tar.gz
egit-cb6594c665a61a5d0c14c6456b196e71bca56ea6.tar.xz
egit-cb6594c665a61a5d0c14c6456b196e71bca56ea6.zip
Trying to fix unstable test: GitRepositoriesViewTest.testOpen
See build #7441 and #7433 on https://hudson.eclipse.org/egit/job/egit.gerrit. Change-Id: Ic145d3d59426c04b5d50758ead56c2ebc18b5785 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java4
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
index 4177e18dda..155fd1843e 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java
@@ -121,6 +121,8 @@ public class GitRepositoriesViewTest extends GitRepositoriesViewTestBase {
fileiItem.doubleClick();
assertTrue(bot.activeEditor().getTitle().equals(FILE1));
bot.activeEditor().close();
+ TestUtil.processUIEvents();
+
// open a branch (checkout)
checkoutWithDoubleClick(tree, "master");
String contentMaster = getTestFileContent();
@@ -138,6 +140,8 @@ public class GitRepositoriesViewTest extends GitRepositoriesViewTestBase {
SWTBotShell shell = bot
.shell(UIText.RepositoriesView_CheckoutConfirmationTitle);
shell.bot().button(IDialogConstants.OK_LABEL).click();
+ TestUtil.processUIEvents();
+ TestUtil.waitForJobs(50, 5000);
refreshAndWait();
}
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
index 5cebb888dc..389cbea014 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java
@@ -115,7 +115,7 @@ public abstract class GitRepositoriesViewTestBase extends
protected void refreshAndWait() throws Exception {
RepositoriesView view = (RepositoriesView) getOrOpenView()
- .getReference().getPart(false);
+ .getReference().getPart(true);
JobJoiner jobJoiner = JobJoiner.startListening(JobFamilies.REPO_VIEW_REFRESH, 60, TimeUnit.SECONDS);
view.refresh();
jobJoiner.join();

Back to the top