Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Piech2012-02-29 17:35:47 +0000
committerPawel Piech2012-02-29 17:35:47 +0000
commitcbea48c768f4fe97194fc7cab9b1c3dc31e63951 (patch)
tree8f455d7cab6443559fd79405641ef09fa19f5bc2
parentbd4d43e331051fa8d92d990ec2c8d76445225081 (diff)
downloadeclipse.platform.debug-cbea48c768f4fe97194fc7cab9b1c3dc31e63951.tar.gz
eclipse.platform.debug-cbea48c768f4fe97194fc7cab9b1c3dc31e63951.tar.xz
eclipse.platform.debug-cbea48c768f4fe97194fc7cab9b1c3dc31e63951.zip
Bug 372619 - 10 test failures in official build
Fixed a race condition in StateTests.testPreserveCollapseAndSelectDeltaAfterSaveAndRestore().
-rw-r--r--org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
index 3ad16f93b..4287a5d6b 100644
--- a/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipe/debug/tests/viewer/model/StateTests.java
@@ -1065,10 +1065,11 @@ abstract public class StateTests extends TestCase implements ITestModelUpdatesLi
fListener.addUpdates(null, path, (TestElement)path.getLastSegment(), 0, STATE_UPDATES);
// Wait till we restore state of elements we want to collapse and select
- while (!fListener.isFinished(STATE_RESTORE_STARTED | STATE_UPDATES | CHILDREN_UPDATES))
+ while (!fListener.isFinished(STATE_RESTORE_STARTED | STATE_UPDATES | CHILDREN_UPDATES | MODEL_CHANGED_COMPLETE))
if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
// Post first collapse delta
+ fListener.resetModelChanged();
model.postDelta(model.makeElementDelta(model.findElement("2"), IModelDelta.COLLAPSE));
while (!fListener.isFinished(MODEL_CHANGED_COMPLETE))
if (!fDisplay.readAndDispatch ()) Thread.sleep(0);

Back to the top