Cache test uses polling to adapt to system speed

Instead of waiting a fixed amount of time for a download, the cache tests use repeated polling to check if the download has finished. This means that on fast systems, the tests will run faster, and on slow systems there should be less random failure. Fixes eclipse-lemminx#753 Signed-off-by: David Thompson <[email protected]>
datho7561 · Sep 22, 2020 · 8ccaf15 · 8ccaf15
1 parent 3ea8abb
commit 8ccaf15
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/...est/java/org/eclipse/lemminx/extensions/contentmodel/XMLSchemaPublishDiagnosticsTest.java b/...est/java/org/eclipse/lemminx/extensions/contentmodel/XMLSchemaPublishDiagnosticsTest.java
@@ -15,6 +15,7 @@
 import static org.eclipse.lemminx.XMLAssert.pd;
 import static org.eclipse.lemminx.XMLAssert.r;
 
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import org.eclipse.lemminx.AbstractCacheBasedTest;
@@ -140,6 +141,8 @@ public void schemaWithUrlWithCache() throws Exception {
 				"</invoice> \r\n" + //
 				"";
 
+		TimeUnit.MILLISECONDS.sleep(500);
+
 		String expectedLocation = TEST_WORK_DIRECTORY.resolve("cache/http/invoice.xsd").toString();
 		XMLAssert.testPublishDiagnosticsFor(xml, fileURI, configuration,
 				pd(fileURI,

diff --git a/...ipse.lemminx/src/test/java/org/eclipse/lemminx/uriresolver/CacheResourcesManagerTest.java b/...ipse.lemminx/src/test/java/org/eclipse/lemminx/uriresolver/CacheResourcesManagerTest.java
@@ -71,9 +71,18 @@ public void testUnavailableCache() throws Exception {
 			fail("cacheResourcesManager should be busy downloading the url");
 		} catch (CacheResourceDownloadingException ignored) {
 		}
-		TimeUnit.MILLISECONDS.sleep(200);
-		// failed to download so returns null
-		assertNull(cacheResourcesManager.getResource(uri));
+
+		boolean downloaded = false;
+		int i = 0;
+		while (!downloaded && i < 9) {
+			try {
+				TimeUnit.MILLISECONDS.sleep(100);
+				assertNull(cacheResourcesManager.getResource(uri));
+				downloaded = true;
+			} catch (CacheResourceDownloadingException e) {
+			}
+			i++;
+		}
 
 		TimeUnit.SECONDS.sleep(1);// wait past the cache expiration date
 
@@ -95,8 +104,18 @@ public void testAvailableCache() throws Exception {
 			fail("cacheResourcesManager should be busy downloading the url");
 		} catch (CacheResourceDownloadingException ignored) {
 		}
-		TimeUnit.MILLISECONDS.sleep(200);
-		assertNotNull(cacheResourcesManager.getResource(uri));
+
+		boolean downloaded = false;
+		int i = 0;
+		while (!downloaded && i < 9) {
+			try {
+				TimeUnit.MILLISECONDS.sleep(100);
+				assertNotNull(cacheResourcesManager.getResource(uri));
+				downloaded = true;
+			} catch (CacheResourceDownloadingException e) {
+			}
+			i++;
+		}
 
 		server.stop();
 		TimeUnit.SECONDS.sleep(1);// wait past the cache expiration date