core: In PF, remove useless requestConnection for CONNECTING subchannel · grpc/grpc-java@82a8d57
@@ -361,11 +361,7 @@ public void pickAfterResolvedAndUnchanged() {
361361// Second acceptResolvedAddresses shouldn't do anything
362362loadBalancer.acceptResolvedAddresses(
363363ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build());
364-if (enableHappyEyeballs) {
365-inOrder.verify(mockSubchannel1, never()).requestConnection();
366- } else {
367-inOrder.verify(mockSubchannel1, times(1)).requestConnection();
368- }
364+inOrder.verify(mockSubchannel1, never()).requestConnection();
369365inOrder.verify(mockHelper, never()).updateBalancingState(any(), any());
370366 }
371367@@ -862,20 +858,15 @@ public void requestConnection() {
862858loadBalancer.requestConnection();
863859inOrder.verify(mockSubchannel2).start(stateListenerCaptor.capture());
864860SubchannelStateListener stateListener2 = stateListenerCaptor.getValue();
865-int expectedRequests = enableHappyEyeballs ? 1 : 2;
866-inOrder.verify(mockSubchannel2, times(expectedRequests)).requestConnection();
861+inOrder.verify(mockSubchannel2).requestConnection();
867862868863stateListener2.onSubchannelState(ConnectivityStateInfo.forNonError(CONNECTING));
869864870865// calling requestConnection is now a no-op
871866loadBalancer.requestConnection();
872867inOrder.verify(mockHelper, never()).updateBalancingState(any(), any());
873868inOrder.verify(mockSubchannel1, never()).requestConnection();
874-if (enableHappyEyeballs) {
875-inOrder.verify(mockSubchannel2, never()).requestConnection();
876- } else {
877-inOrder.verify(mockSubchannel2).requestConnection();
878- }
869+inOrder.verify(mockSubchannel2, never()).requestConnection();
879870 }
880871881872@Test