Merge pull request #1113 from wburns/ispn_fix_test

Adding in delay in case if first assertion fails
quarkusio · Feb 28, 2019 · ad0cc8c · ad0cc8c
2 parents 6d7706e + 5e944dc
commit ad0cc8c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 40 deletions.
diff --git a/integration-tests/infinispan-client/README.md b/integration-tests/infinispan-client/README.md
diff --git a/...ests/infinispan-client/src/main/java/io/quarkus/example/infinispanclient/TestServlet.java b/...ests/infinispan-client/src/main/java/io/quarkus/example/infinispanclient/TestServlet.java
@@ -265,7 +265,7 @@ public String nearCache() {
 
         long misses = stats.getNearCacheMisses();
         if (nearCacheMisses + 1 != misses) {
-            return "Near cache didn't miss for some reason. Expected: " + nearCacheMisses + 1 + " but got: " + misses;
+            return "Near cache didn't miss for some reason. Expected: " + (nearCacheMisses + 1) + " but got: " + misses;
         }
 
         if (!retrievedBook.equals(nearCacheBook)) {
@@ -280,7 +280,7 @@ public String nearCache() {
         long hits = stats.getNearCacheHits();
 
         if (nearCacheHits + 1 != hits) {
-            return "Near cache didn't hit for some reason. Expected: " + nearCacheHits + 1 + " but got: " + hits;
+            return "Near cache didn't hit for some reason. Expected: " + (nearCacheHits + 1) + " but got: " + hits;
         }
 
         if (!retrievedBook.equals(nearCacheBook)) {
@@ -293,8 +293,17 @@ public String nearCache() {
 
         long invalidations = stats.getNearCacheInvalidations();
         if (nearCacheInvalidations + 1 != invalidations) {
-            return "Near cache didn't invalidate for some reason. Expected: " + nearCacheInvalidations + 1 + " but got: "
-                    + invalidations;
+            // Try a second time after waiting just a little bit
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            invalidations = stats.getNearCacheInvalidations();
+            if (nearCacheInvalidations + 1 != invalidations) {
+                return "Near cache didn't invalidate for some reason. Expected: " + (nearCacheInvalidations + 1) + " but got: "
+                        + invalidations;
+            }
         }
 
         cache.remove(id);

diff --git a/...ispan-client/src/test/java/io/quarkus/example/test/InfinispanClientFunctionalityTest.java b/...ispan-client/src/test/java/io/quarkus/example/test/InfinispanClientFunctionalityTest.java
@@ -15,7 +15,6 @@
  */
 @QuarkusTest
 @QuarkusTestResource(InfinispanServerTestResource.class)
-@Disabled("Intermittently failing")
 public class InfinispanClientFunctionalityTest {
 
     @Test