Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/gcov
diff options
context:
space:
mode:
authorAndrew Ferrazzutti2014-06-11 20:43:35 +0000
committerAlexander Kurtakov2014-06-26 05:34:00 +0000
commit8efc57b7d62a12b75b440aeaf7679c6669845cf9 (patch)
tree2767f588d3350475bb676643e55e2a21ac257453 /gcov
parent9b7bac53e0dc74a1bf1499bb9ee800608bd1df56 (diff)
downloadorg.eclipse.linuxtools-8efc57b7d62a12b75b440aeaf7679c6669845cf9.tar.gz
org.eclipse.linuxtools-8efc57b7d62a12b75b440aeaf7679c6669845cf9.tar.xz
org.eclipse.linuxtools-8efc57b7d62a12b75b440aeaf7679c6669845cf9.zip
Stop SWTBot test hangs by forcing dialog focus.
Change-Id: I4374f454e8e74f59649b6cd0381a0201d107e51c Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com> Reviewed-on: https://git.eclipse.org/r/29002 Tested-by: Hudson CI Reviewed-by: Alexander Kurtakov <akurtako@redhat.com> Tested-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'gcov')
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
index b95b30a71d..57b625ad66 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
+++ b/gcov/org.eclipse.linuxtools.gcov.test/src/org/eclipse/linuxtools/internal/gcov/test/GcovTest.java
@@ -140,7 +140,6 @@ public abstract class GcovTest {
for (SWTBotShell sh : bot.shells()) {
if (sh.getText().startsWith("C/C++")) {
sh.activate();
- bot.waitUntil(Conditions.shellIsActive(sh.getText()));
mainShell = sh;
break;
}
@@ -336,9 +335,7 @@ public abstract class GcovTest {
private static void openResource(SWTWorkbenchBot bot, String fileName) {
mainShell.activate();
bot.menu("Navigate").menu("Open Resource...").click();
- bot.waitUntil(Conditions.shellIsActive("Open Resource"));
- SWTBotShell shell = bot.shell("Open Resource");
- shell.activate();
+ SWTBotShell shell = bot.shell("Open Resource").activate();
bot.text().setText(fileName);
bot.button("Open").click();
bot.waitUntil(Conditions.shellCloses(shell));

Back to the top