Attempt to fix intermitant test failureI20050331

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index 3dc066b2a..5bd2b8ca4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -34,6 +34,7 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileChangeListener;
 import org.eclipse.team.internal.ccvs.ui.operations.*;
 import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector;
 import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.internal.decorators.DecoratorManager;
 
 public class EclipseTest extends ResourceTest {
 
@@ -870,7 +871,17 @@ public class EclipseTest extends ResourceTest {
 	
 	public static void waitForIgnoreFileHandling() {
 		waitForJobCompletion(SyncFileChangeListener.getDeferredHandler().getEventHandlerJob());
+        waitForDecorator();
 	}
+
+    private static void waitForDecorator() {
+        // Wait for the decorator job
+        Job[] decorators = Platform.getJobManager().find(DecoratorManager.FAMILY_DECORATE);
+        for (int i = 0; i < decorators.length; i++) {
+            Job job = decorators[i];
+            waitForJobCompletion(job);
+        }
+    }
 	
 	public static void waitForSubscriberInputHandling(SubscriberSyncInfoCollector input) {
 		input.waitForCollector(new IProgressMonitor() {