Attempt to fix some recent flakiness in testAwaitFullGc.

I'm doing so by following the advice from martinrb@ in cl/26588812. I don't really have a good way to test this, but presumably I'll notice eventually if the flakiness remains. RELNOTES=n/a PiperOrigin-RevId: 716747770
remeio · Jan 17, 2025 · a3d5c96 · a3d5c96
1 parent 22046a3
commit a3d5c96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java b/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java
@@ -233,8 +233,8 @@ protected void finalize() {
     // Use e.g. awaitClear or await(CountDownLatch) instead.
     GcFinalization.awaitFullGc();
 
-    // If this test turns out to be flaky, add a second call to awaitFullGc()
-    // GcFinalization.awaitFullGc();
+    // Attempt to help with some flakiness that we've seen: b/387521512.
+    GcFinalization.awaitFullGc();
 
     assertEquals(0, finalizerRan.getCount());
     assertNull(ref.get());

diff --git a/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java b/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java
@@ -233,8 +233,8 @@ protected void finalize() {
     // Use e.g. awaitClear or await(CountDownLatch) instead.
     GcFinalization.awaitFullGc();
 
-    // If this test turns out to be flaky, add a second call to awaitFullGc()
-    // GcFinalization.awaitFullGc();
+    // Attempt to help with some flakiness that we've seen: b/387521512.
+    GcFinalization.awaitFullGc();
 
     assertEquals(0, finalizerRan.getCount());
     assertNull(ref.get());