Save changes.

Author: kannanjgithub

rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java

@@ -23,6 +23,7 @@
 import static io.grpc.rls.CachingRlsLbClient.RLS_DATA_KEY;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -171,7 +172,6 @@ public void uncaughtException(Thread t, Throwable e) {
   private CachingRlsLbClient rlsLbClient;
   private Map<String, ?> rlsChannelServiceConfig;
   private String rlsChannelOverriddenAuthority;
-  private Server server;
 
   private void setUpRlsLbClient() {
     fakeThrottler.resetCounts();
@@ -348,16 +348,16 @@ public void controlPlaneTransientToReady_backOffEntriesRemovedAndPickerUpdated()
             routeLookupRequest,
             RouteLookupResponse.create(ImmutableList.of("target"), "header")));
 
+    fakeHelper.server.shutdown();
     fakeThrottler.nextResult = true;
     fakeBackoffProvider.nextPolicy = createBackoffPolicy(10, TimeUnit.MILLISECONDS);
 
     CachedRouteLookupResponse resp = getInSyncContext(routeLookupRequest);
 
     assertThat(resp.hasError()).isTrue();
 
-    // let it pass throttler
-    fakeThrottler.nextResult = false;
-    fakeClock.forwardTime(10, TimeUnit.MILLISECONDS);
+    fakeHelper.server.start();
+    Thread.sleep(10000);
     // Backoff entry evicted from cache.
     verify(evictionListener)
         .onEviction(eq(routeLookupRequest), any(CacheEntry.class), eq(EvictionType.EXPLICIT));
@@ -910,6 +910,8 @@ public void run() {
   private final class FakeHelper extends Helper {
 
     SubchannelPicker lastPicker;
+    Server server;
+    ManagedChannel oobChannel;
     @Override
     public ManagedChannelBuilder<?> createResolvingOobChannelBuilder(
         String target, ChannelCredentials creds) {
@@ -953,7 +955,9 @@ public CleaningChannelBuilder overrideAuthority(String authority) {
         }
       }
 
-      return new CleaningChannelBuilder();
+      CleaningChannelBuilder oobChannelBuilder = new CleaningChannelBuilder();
+      oobChannel = oobChannelBuilder.build();
+      return oobChannelBuilder;
     }
 
     @Override