More robust way to wait for Connection terminated message

Author: jglick

pom.xml

@@ -154,6 +154,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>4.2.0</version>
+      <scope>test</scope>
+    </dependency>
     <!-- MockFolder that was used for SupportAbstractItem test does not have UI, hence need full Folder implementation.-->
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

src/test/java/com/cloudbees/jenkins/support/impl/SlaveLaunchLogsTest.java

@@ -1,5 +1,6 @@
 package com.cloudbees.jenkins.support.impl;
 
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
@@ -80,7 +81,10 @@ public void offlineAgent() throws Exception {
     public void deletedAgent() throws Exception {
         var s = j.createOnlineSlave();
         s.toComputer().disconnect(null).get();
-        Thread.sleep(1000); // TODO otherwise log is not flushed?
+        await().until(
+                        () -> SupportTestUtils.invokeComponentToString(
+                                ExtensionList.lookupSingleton(SlaveLaunchLogs.class)),
+                        containsString("Connection terminated"));
         j.jenkins.removeNode(s);
         assertThat(
                 "still includes something",
@@ -92,7 +96,10 @@ public void deletedAgent() throws Exception {
     public void multipleLaunchLogs() throws Exception {
         var s = j.createOnlineSlave();
         s.toComputer().disconnect(null).get();
-        Thread.sleep(1000); // TODO as above
+        await().until(
+                        () -> SupportTestUtils.invokeComponentToString(
+                                ExtensionList.lookupSingleton(SlaveLaunchLogs.class)),
+                        containsString("Connection terminated"));
         s.toComputer().connect(false).get();
         assertThat(
                 "notes both launch logs",