From 560608100f3f69b2ff5716c969d20c6802f79451 Mon Sep 17 00:00:00 2001 From: yifeizhuang Date: Wed, 10 Jan 2024 13:25:56 -0800 Subject: [PATCH] fix flaky xds test due to verification race (#10798) (#10808) --- xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java index 054b1252ec0..4c3e05d8f1b 100644 --- a/xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java +++ b/xds/src/test/java/io/grpc/xds/XdsClientImplTestBase.java @@ -3010,10 +3010,10 @@ public void flowControlAbsent() throws Exception { + "Cluster cluster.googleapis.com2: unspecified cluster discovery type"; call.verifyRequestNack(CDS, Arrays.asList(CDS_RESOURCE, anotherCdsResource), VERSION_1, "0001", NODE, Arrays.asList(errorMsg)); - verify(anotherWatcher).onResourceDoesNotExist(eq(anotherCdsResource)); barrier.await(); latch.await(10, TimeUnit.SECONDS); verify(cdsResourceWatcher, times(2)).onChanged(any()); + verify(anotherWatcher).onResourceDoesNotExist(eq(anotherCdsResource)); verify(anotherWatcher).onError(any()); }