Fix flaky metrics integration tests

dssysolyatin · Mar 22, 2021 · f84648f · f84648f
1 parent 130fd25
commit f84648f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...gration-tests/src/test/java/com/datastax/oss/driver/core/metrics/DropwizardMetricsIT.java b/...gration-tests/src/test/java/com/datastax/oss/driver/core/metrics/DropwizardMetricsIT.java
@@ -16,6 +16,7 @@
 package com.datastax.oss.driver.core.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
@@ -95,7 +96,7 @@ protected void assertMetricsPresent(CqlSession session) {
           break;
         case CQL_REQUESTS:
           assertThat(m).isInstanceOf(Timer.class);
-          assertThat(((Timer) m).getCount()).isEqualTo(30);
+          await().untilAsserted(() -> assertThat(((Timer) m).getCount()).isEqualTo(30));
           break;
         case CQL_PREPARED_CACHE_SIZE:
           assertThat(m).isInstanceOf(Gauge.class);
@@ -144,7 +145,7 @@ protected void assertMetricsPresent(CqlSession session) {
             break;
           case CQL_MESSAGES:
             assertThat(m).isInstanceOf(Timer.class);
-            assertThat(((Timer) m).getCount()).isEqualTo(10);
+            await().untilAsserted(() -> assertThat(((Timer) m).getCount()).isEqualTo(10));
             break;
           case READ_TIMEOUTS:
           case WRITE_TIMEOUTS:

diff --git a/...n-tests/src/test/java/com/datastax/oss/driver/metrics/micrometer/MicrometerMetricsIT.java b/...n-tests/src/test/java/com/datastax/oss/driver/metrics/micrometer/MicrometerMetricsIT.java
@@ -16,6 +16,7 @@
 package com.datastax.oss.driver.metrics.micrometer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.Node;
@@ -86,7 +87,7 @@ protected void assertMetricsPresent(CqlSession session) {
           break;
         case CQL_REQUESTS:
           assertThat(m).isInstanceOf(Timer.class);
-          assertThat(((Timer) m).count()).isEqualTo(30);
+          await().untilAsserted(() -> assertThat(((Timer) m).count()).isEqualTo(30));
           break;
         case CQL_PREPARED_CACHE_SIZE:
           assertThat(m).isInstanceOf(Gauge.class);
@@ -128,7 +129,7 @@ protected void assertMetricsPresent(CqlSession session) {
             break;
           case CQL_MESSAGES:
             assertThat(m).isInstanceOf(Timer.class);
-            assertThat(((Timer) m).count()).isEqualTo(10);
+            await().untilAsserted(() -> assertThat(((Timer) m).count()).isEqualTo(10));
             break;
           case READ_TIMEOUTS:
           case WRITE_TIMEOUTS:

diff --git a/...sts/src/test/java/com/datastax/oss/driver/metrics/microprofile/MicroProfileMetricsIT.java b/...sts/src/test/java/com/datastax/oss/driver/metrics/microprofile/MicroProfileMetricsIT.java
@@ -16,6 +16,7 @@
 package com.datastax.oss.driver.metrics.microprofile;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.Node;
@@ -91,7 +92,7 @@ protected void assertMetricsPresent(CqlSession session) {
           break;
         case CQL_REQUESTS:
           assertThat(m).isInstanceOf(Timer.class);
-          assertThat(((Timer) m).getCount()).isEqualTo(30);
+          await().untilAsserted(() -> assertThat(((Timer) m).getCount()).isEqualTo(30));
           break;
         case CQL_PREPARED_CACHE_SIZE:
           assertThat(m).isInstanceOf(Gauge.class);
@@ -134,7 +135,7 @@ protected void assertMetricsPresent(CqlSession session) {
             break;
           case CQL_MESSAGES:
             assertThat(m).isInstanceOf(Timer.class);
-            assertThat(((Timer) m).getCount()).isEqualTo(10);
+            await().untilAsserted(() -> assertThat(((Timer) m).getCount()).isEqualTo(10));
             break;
           case READ_TIMEOUTS:
           case WRITE_TIMEOUTS: