Ensure background thread is joined in InterruptedApiCallTest.

PiperOrigin-RevId: 889005882
Change-Id: Ic3e7de62747e1566c305fd757147640d567be4d1

Author: ludoch

runtime/runtime_impl_jetty121/src/test/java/com/google/apphosting/runtime/http/InterruptedApiCallTest.java

@@ -40,16 +40,21 @@ public class InterruptedApiCallTest extends HttpApiProxyImplTestBase {
    * it only gets expected exceptions.
    */
   @Test
-  public void interruptedApiCall() {
+  public void interruptedApiCall() throws InterruptedException {
     AtomicBoolean stop = new AtomicBoolean();
+    Thread apiClientThread = null;
     try {
-      interruptedApiCall(stop);
+      apiClientThread = interruptedApiCall(stop);
     } finally {
       stop.set(true);
+      if (apiClientThread != null) {
+        apiClientThread.interrupt(); // Ensure it wakes up from any blocking call
+        apiClientThread.join();
+      }
     }
   }
 
-  private void interruptedApiCall(AtomicBoolean stop) {
+  private Thread interruptedApiCall(AtomicBoolean stop) {
     HttpApiHostClient.Config interruptibleConfig =
         config.toBuilder()
             // With the Jetty client, this test occasionally gets ClosedChannelException. Since
@@ -77,6 +82,7 @@ private void interruptedApiCall(AtomicBoolean stop) {
     }
     assertThat(apiClientTask.exceptionInMakeAsyncCall.get()).isNull();
     assertThat(apiClientTask.exceptionInFutureGet.get()).isNull();
+    return apiClientThread;
   }
 
   private static class ApiClientTask implements Runnable {

runtime/runtime_impl_jetty9/src/test/java/com/google/apphosting/runtime/http/InterruptedApiCallTest.java

@@ -40,16 +40,21 @@ public class InterruptedApiCallTest extends HttpApiProxyImplTestBase {
    * it only gets expected exceptions.
    */
   @Test
-  public void interruptedApiCall() {
+  public void interruptedApiCall() throws InterruptedException {
     AtomicBoolean stop = new AtomicBoolean();
+    Thread apiClientThread = null;
     try {
-      interruptedApiCall(stop);
+      apiClientThread = interruptedApiCall(stop);
     } finally {
       stop.set(true);
+      if (apiClientThread != null) {
+        apiClientThread.interrupt(); // Ensure it wakes up from any blocking call
+        apiClientThread.join();
+      }
     }
   }
 
-  private void interruptedApiCall(AtomicBoolean stop) {
+  private Thread interruptedApiCall(AtomicBoolean stop) {
     HttpApiHostClient.Config interruptibleConfig =
         config.toBuilder()
             // With the Jetty client, this test occasionally gets ClosedChannelException. Since
@@ -77,6 +82,7 @@ private void interruptedApiCall(AtomicBoolean stop) {
     }
     assertThat(apiClientTask.exceptionInMakeAsyncCall.get()).isNull();
     assertThat(apiClientTask.exceptionInFutureGet.get()).isNull();
+    return apiClientThread;
   }
 
   private static class ApiClientTask implements Runnable {