diff options
author | Simeon Andreev | 2019-10-30 11:59:57 +0000 |
---|---|---|
committer | Simeon Andreev | 2019-10-30 12:18:32 +0000 |
commit | 88d977e81763c6938cf81d36be15a25e8b91681e (patch) | |
tree | eccc16fdc3fa84a6dc463dc409995a8cc0928328 | |
parent | d9224e62fcf5f64f71abb3bbf84c10055868e7fd (diff) | |
download | eclipse.platform.ua-88d977e81763c6938cf81d36be15a25e8b91681e.tar.gz eclipse.platform.ua-88d977e81763c6938cf81d36be15a25e8b91681e.tar.xz eclipse.platform.ua-88d977e81763c6938cf81d36be15a25e8b91681e.zip |
Bug 549166 - Tests running in tips UI jobI20191103-1800I20191102-1800I20191101-1800I20191101-0300I20191031-1800I20191031-1325
In org.eclipse.tips.ui.internal.TipComposite, methods
loadTimeOutScript() and loadWaitingScript() will process SWT display
events. This code runs during
org.eclipse.tips.ide.internal.Startup$2.runInUIThread, when showing the
tips dialog on start-up. As a result, the Eclipse test harness can run
tests in this UA start-up UI job. From that point on, tests that wait
for jobs to finish will hang forever, since the tests themselves run
inside a UI job.
This change removes processing of display events in tips UI job. This
prevents Eclipse tests from running in a tips UI job, which in turn
results into a "hanging" tips UI job.
Change-Id: Ica968412ccc427e35d68c12e95efd14da5d9254d
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
-rw-r--r-- | org.eclipse.tips.ui/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.tips.ui/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/org.eclipse.tips.ui/META-INF/MANIFEST.MF b/org.eclipse.tips.ui/META-INF/MANIFEST.MF index 247034fd8..aa086b200 100644 --- a/org.eclipse.tips.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tips.ui;singleton:=true -Bundle-Version: 0.1.700.qualifier +Bundle-Version: 0.1.800.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0", org.eclipse.jface;bundle-version="3.0.0", diff --git a/org.eclipse.tips.ui/pom.xml b/org.eclipse.tips.ui/pom.xml index f7eaa2122..6d06726d7 100644 --- a/org.eclipse.tips.ui/pom.xml +++ b/org.eclipse.tips.ui/pom.xml @@ -22,6 +22,6 @@ </parent> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.tips.ui</artifactId> - <version>0.1.700-SNAPSHOT</version> + <version>0.1.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java index 86c4f5632..af15d2d2c 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java @@ -458,11 +458,6 @@ public class TipComposite extends Composite implements ProviderSelectionListener */ private void loadTimeOutScript() { fBrowser.setText(getLoadingScript(500)); - while (!isDisposed()) { - if (!getDisplay().readAndDispatch()) { - break; - } - } } /** @@ -471,11 +466,6 @@ public class TipComposite extends Composite implements ProviderSelectionListener */ private void loadWaitingScript() { fBrowser.setText(getWaitingScript(1500)); - while (!isDisposed()) { - if (!getDisplay().readAndDispatch()) { - break; - } - } } /** |