Add awaits to ensure the pods are present before interacting with controller

Author: kenfinnigan

pom.xml

@@ -79,8 +79,13 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-test-kubernetes-client</artifactId>
       <scope>test</scope>
-  </dependency>  
-  </dependencies>
+    </dependency>  
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
+</dependencies>
 
   <build>
     <plugins>

src/main/java/com/redhat/MeterController.java

@@ -109,7 +109,7 @@ public UpdateControl<Meter> createOrUpdateResource(Meter resource, Context<Meter
     }
 
     void createServiceMonitor() {
-        if (serviceMonitor().isReady() && serviceMonitor().get() != null) {
+        if (serviceMonitor().get() != null) {
             System.out.println("SKIPPED INSTALL");
             // Don't repeat the install
             return;

src/test/java/com/redhat/MeterControllerTest.java

@@ -9,6 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
@@ -19,6 +20,7 @@
 
 import javax.inject.Inject;
 
+import org.awaitility.Awaitility;
 import org.hamcrest.text.IsEmptyString;
 import org.jboss.logmanager.LogManager;
 import org.junit.jupiter.api.BeforeEach;
@@ -272,6 +274,8 @@ void testSpecWithMeterCollectionEnabledThenDisabledWithPods() {
         mockServer.getClient().pods().create(pod1);
         mockServer.getClient().pods().create(pod2);
 
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> meterController.getWatcher().watchedPods().equals("2"));
+
         response = meterController.createOrUpdateResource(meter, null);
 
         assertNotNull(response);
@@ -381,6 +385,8 @@ void testStatusWatchingPods() {
         mockServer.getClient().pods().create(pod1);
         mockServer.getClient().pods().create(pod2);
 
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> meterController.getWatcher().watchedPods().equals("2"));
+
         response = meterController.createOrUpdateResource(meter, null);
 
         assertNotNull(response);
@@ -458,6 +464,8 @@ void testStatusWatchingPodsAndInfrastructureFlag() {
         mockServer.getClient().pods().create(pod1);
         mockServer.getClient().pods().create(pod2);
 
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> meterController.getWatcher().watchedPods().equals("2"));
+
         response = meterController.createOrUpdateResource(meter, null);
 
         assertNotNull(response);
@@ -689,6 +697,8 @@ void testProductNamesLimitedToDefinedThree() {
         mockServer.getClient().pods().create(pod2);
         mockServer.getClient().pods().create(pod3);
 
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> meterController.getWatcher().watchedPods().equals("2"));
+
         response = meterController.createOrUpdateResource(meter, null);
 
         assertNotNull(response);