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

xds: fix bug of verifying xDS requests with ordered resource names 

Use matcher that takes care of resource name ordering for comparing requests.
This commit is contained in:
Chengyuan Zhang 2019-12-09 16:39:26 -08:00 committed by GitHub
parent e66ab4e63b
commit 942c1c6b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
View File

@ -1474,9 +1474,10 @@ public class XdsClientImplTest {
// Client sent a new CDS request for all interested resources. // Client sent a new CDS request for all interested resources.
verify(requestObserver) verify(requestObserver)
.onNext( .onNext(
eq(buildDiscoveryRequest(NODE, "0", argThat(
ImmutableList.of("cluster-foo.googleapis.com", "cluster-bar.googleapis.com"), new DiscoveryRequestMatcher("0",
XdsClientImpl.ADS_TYPE_URL_CDS, "0000"))); ImmutableList.of("cluster-foo.googleapis.com", "cluster-bar.googleapis.com"),
XdsClientImpl.ADS_TYPE_URL_CDS, "0000")));
// Management server sends back a CDS response with Cluster for all requested cluster. // Management server sends back a CDS response with Cluster for all requested cluster.
clusters = ImmutableList.of( clusters = ImmutableList.of(