Skip to content

Commit 863d811

Browse files
committed
Set expected requestConnection count based on whether happy eyeballs is enabled or not
1 parent b32466b commit 863d811

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

xds/src/test/java/io/grpc/xds/RingHashLoadBalancerTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ public void subchannelLazyConnectUntilPicked() {
151151
assertThat(result.getStatus().isOk()).isTrue();
152152
assertThat(result.getSubchannel()).isNull();
153153
Subchannel subchannel = Iterables.getOnlyElement(subchannels.values());
154-
verify(subchannel).requestConnection();
154+
int expectedTimes = PickFirstLoadBalancerProvider.isEnabledHappyEyeballs() ? 1 : 2;
155+
verify(subchannel, times(expectedTimes)).requestConnection();
155156
verify(helper).updateBalancingState(eq(CONNECTING), any(SubchannelPicker.class));
156157
verify(helper).createSubchannel(any(CreateSubchannelArgs.class));
157158
deliverSubchannelState(subchannel, CSI_CONNECTING);
@@ -185,7 +186,8 @@ public void subchannelNotAutoReconnectAfterReenteringIdle() {
185186
pickerCaptor.getValue().pickSubchannel(args);
186187
Subchannel subchannel = subchannels.get(Collections.singletonList(childLbState.getEag()));
187188
InOrder inOrder = Mockito.inOrder(helper, subchannel);
188-
inOrder.verify(subchannel).requestConnection();
189+
int expectedTimes = PickFirstLoadBalancerProvider.isEnabledHappyEyeballs() ? 1 : 2;
190+
inOrder.verify(subchannel, times(expectedTimes)).requestConnection();
189191
deliverSubchannelState(subchannel, CSI_READY);
190192
inOrder.verify(helper).updateBalancingState(eq(READY), any(SubchannelPicker.class));
191193
deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(IDLE));
@@ -443,7 +445,8 @@ public void skipFailingHosts_pickNextNonFailingHost() {
443445
PickResult result = pickerCaptor.getValue().pickSubchannel(args);
444446
assertThat(result.getStatus().isOk()).isTrue();
445447
assertThat(result.getSubchannel()).isNull(); // buffer request
446-
verify(getSubChannel(servers.get(1))).requestConnection(); // kicked off connection to server2
448+
int expectedTimes = PickFirstLoadBalancerProvider.isEnabledHappyEyeballs() ? 1 : 2;
449+
verify(getSubChannel(servers.get(1)), times(expectedTimes)).requestConnection(); // kicked off connection to server2
447450
assertThat(subchannels.size()).isEqualTo(2); // no excessive connection
448451

449452
deliverSubchannelState(getSubChannel(servers.get(1)), CSI_CONNECTING);

0 commit comments

Comments
 (0)