diff options
| author | Thomas Wolf | 2016-04-29 21:51:21 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2016-05-03 18:36:13 +0000 |
| commit | d7ac0761cab83d23c1f67096b20914ec7cbda43b (patch) | |
| tree | 2c523c0e1cb0718a84e0454a88aa336f9cf4fb71 | |
| parent | 4bdcf80be11c7b3e2b9ec2b7d7383cf5ab0412df (diff) | |
| download | egit-d7ac0761cab83d23c1f67096b20914ec7cbda43b.tar.gz egit-d7ac0761cab83d23c1f67096b20914ec7cbda43b.tar.xz egit-d7ac0761cab83d23c1f67096b20914ec7cbda43b.zip | |
Test stability: after clicking finish, wait for shell to close.
The failure in build 8454 was apparently caused by the test switching
to the repositories view before the create branch dialog had closed.
Change-Id: Ic2e871f5a9da81dd68d9c43758f99118f57428d1
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java index 9ffdc2c1c6..7407820880 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewBranchHandlingTest.java @@ -44,6 +44,7 @@ import org.eclipse.jgit.transport.URIish; import org.eclipse.osgi.util.NLS; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; +import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; @@ -224,6 +225,7 @@ public class GitRepositoriesViewBranchHandlingTest extends shell.activate(); assertEquals("stable", shell.bot().textWithId("BranchName").getText()); shell.bot().button(IDialogConstants.FINISH_LABEL).click(); + bot.waitUntil(Conditions.shellCloses(shell)); refreshAndWait(); item = TestUtil.expandAndWait(myRepoViewUtil.getLocalBranchesItem(tree, clonedRepositoryFile)); |