Skip to content

Commit 486b8ba

Browse files
authored
Fix tsan error (#11742)
Eliminate unneeded fakeClock.forwardTime() that was causing the conflict.
1 parent f1109e4 commit 486b8ba

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public void fallbackFromBadUrlToGoodOne() {
428428

429429
@Test
430430
public void testGoodUrlFollowedByBadUrl() {
431-
// Setup xdsClient to fail on stream creation
431+
// xdsClient should succeed in stream creation as it doesn't need to use the bad url
432432
String garbageUri = "some. garbage";
433433
String validUri = "localhost:" + mainXdsServer.getServer().getPort();
434434

@@ -437,7 +437,6 @@ public void testGoodUrlFollowedByBadUrl() {
437437
new ExponentialBackoffPolicy.Provider(), MessagePrinter.INSTANCE, xdsClientMetricReporter);
438438

439439
client.watchXdsResource(XdsListenerResource.getInstance(), MAIN_SERVER, ldsWatcher);
440-
fakeClock.forwardTime(20, TimeUnit.SECONDS);
441440
verify(ldsWatcher, timeout(5000)).onChanged(
442441
XdsListenerResource.LdsUpdate.forApiListener(
443442
MAIN_HTTP_CONNECTION_MANAGER));

0 commit comments

Comments
 (0)