Bug 538060 - IFileTest.testSetContents1 is unstableI20180820-2000

Adjusted test to ensure an out-of-sync resource is really out-of-sync.
Removed un-functional fix.

Change-Id: I4cd2e7dfea04d18f7cbbe08bc79829394362b304

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java
index 42e8fba73..266207eb1 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java
@@ -980,12 +980,6 @@ public class IFileTest extends ResourceTest {
 					((FussyProgressMonitor) monitor).prepare();
 				}
 				file.setContents(stream, force, false, monitor);
-				boolean isOutOfSyncTestFile = outOfSync(file);
-				if (isOutOfSyncTestFile) {
-					// The test expects this file to be out of sync, when modified on file system
-					// level later on. We wait a moment to let this actually be the case.
-					Thread.sleep(10);
-				}
 				if (monitor instanceof FussyProgressMonitor) {
 					((FussyProgressMonitor) monitor).sanityCheck();
 				}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
index b08767161..457a75d02 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
@@ -659,6 +659,12 @@ public abstract class ResourceTest extends CoreTest {
 	 */
 	public void ensureOutOfSync(final IFile file) {
 		modifyInFileSystem(file);
+		// Ensure the file is out-of-sync by waiting before touching it in the OS file system.
+		try {
+			Thread.sleep(5);
+		} catch (InterruptedException e) {
+			throw new AssertionError("unexpected interruption while ensuring that file is out-of-sync", e);
+		}
 		touchInFilesystem(file);
 		assertTrue("File not out of sync: " + file.getLocation().toOSString(), file.getLocation().toFile().lastModified() != file.getLocalTimeStamp());
 	}