Skip to content

Commit

Permalink
Fix tsan error (grpc#11742)
Browse files Browse the repository at this point in the history
Eliminate unneeded fakeClock.forwardTime() that was causing the conflict.
  • Loading branch information
larry-safran authored Dec 12, 2024
1 parent f1109e4 commit 486b8ba
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions xds/src/test/java/io/grpc/xds/XdsClientFallbackTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public void fallbackFromBadUrlToGoodOne() {

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

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

client.watchXdsResource(XdsListenerResource.getInstance(), MAIN_SERVER, ldsWatcher);
fakeClock.forwardTime(20, TimeUnit.SECONDS);
verify(ldsWatcher, timeout(5000)).onChanged(
XdsListenerResource.LdsUpdate.forApiListener(
MAIN_HTTP_CONNECTION_MANAGER));
Expand Down

0 comments on commit 486b8ba

Please sign in to comment.