flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds:Fix test flakiness by adding a timeout to verify. (#9771) 

* xds:Fix test flakiness by adding a timeout to verify.
* Add a note warning about multiple threads in the test.
This commit is contained in:
Larry Safran 2022-12-21 22:29:17 +00:00 committed by GitHub
parent fe19152108
commit 530cf905b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java
View File

@ -3535,8 +3535,10 @@ public abstract class XdsClientImplTestBase {
.start());
fakeClock.forwardTime(5, TimeUnit.SECONDS);
DiscoveryRpcCall call = resourceDiscoveryCalls.poll(3, TimeUnit.SECONDS);
Thread.sleep(1); // For some reason the V2 test fails the verifyRequest without this
// NOTE: There is a ScheduledExecutorService that may get involved due to the reconnect
// so you cannot rely on the logic being single threaded. The timeout() in verifyRequest
// is therefore necessary to avoid flakiness.
// Send a response and do verifications
verify(ldsResourceWatcher, never()).onResourceDoesNotExist(LDS_RESOURCE);
call.sendResponse(LDS, mf.buildWrappedResource(testListenerVhosts), VERSION_1, "0001");

5
xds/src/test/java/io/grpc/xds/XdsClientImplV2Test.java
View File

@ -105,6 +105,7 @@ import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.mockito.ArgumentMatcher;
import org.mockito.InOrder;
import org.mockito.Mockito;
/**
* Tests for {@link XdsClientImpl} with protocol version v2.
@ -198,7 +199,7 @@ public class XdsClientImplV2Test extends XdsClientImplTestBase {
protected void verifyRequest(
XdsResourceType<?> type, List<String> resources, String versionInfo, String nonce,
EnvoyProtoData.Node node) {
verify(requestObserver).onNext(argThat(new DiscoveryRequestMatcher(
verify(requestObserver, Mockito.timeout(2000)).onNext(argThat(new DiscoveryRequestMatcher(
node.toEnvoyProtoNodeV2(), versionInfo, resources, type.typeUrlV2(), nonce, null, null)));
}
@ -206,7 +207,7 @@ public class XdsClientImplV2Test extends XdsClientImplTestBase {
protected void verifyRequestNack(
XdsResourceType<?> type, List<String> resources, String versionInfo, String nonce,
EnvoyProtoData.Node node, List<String> errorMessages) {
verify(requestObserver).onNext(argThat(new DiscoveryRequestMatcher(
verify(requestObserver, Mockito.timeout(2000)).onNext(argThat(new DiscoveryRequestMatcher(
node.toEnvoyProtoNodeV2(), versionInfo, resources, type.typeUrlV2(), nonce,
Code.INVALID_ARGUMENT_VALUE, errorMessages)));
}

5
xds/src/test/java/io/grpc/xds/XdsClientImplV3Test.java
View File

@ -113,6 +113,7 @@ import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.mockito.ArgumentMatcher;
import org.mockito.InOrder;
import org.mockito.Mockito;
/**
* Tests for {@link XdsClientImpl} with protocol version v3.
@ -206,7 +207,7 @@ public class XdsClientImplV3Test extends XdsClientImplTestBase {
protected void verifyRequest(
XdsResourceType<?> type, List<String> resources, String versionInfo, String nonce,
EnvoyProtoData.Node node) {
verify(requestObserver).onNext(argThat(new DiscoveryRequestMatcher(
verify(requestObserver, Mockito.timeout(2000)).onNext(argThat(new DiscoveryRequestMatcher(
node.toEnvoyProtoNode(), versionInfo, resources, type.typeUrl(), nonce, null, null)));
}
@ -214,7 +215,7 @@ public class XdsClientImplV3Test extends XdsClientImplTestBase {
protected void verifyRequestNack(
XdsResourceType<?> type, List<String> resources, String versionInfo, String nonce,
EnvoyProtoData.Node node, List<String> errorMessages) {
verify(requestObserver).onNext(argThat(new DiscoveryRequestMatcher(
verify(requestObserver, Mockito.timeout(2000)).onNext(argThat(new DiscoveryRequestMatcher(
node.toEnvoyProtoNode(), versionInfo, resources, type.typeUrl(), nonce,
Code.INVALID_ARGUMENT_VALUE, errorMessages)));
}