Skip to content

Commit a3d5c96

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
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
1 parent 22046a3 commit a3d5c96

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ protected void finalize() {
233233
// Use e.g. awaitClear or await(CountDownLatch) instead.
234234
GcFinalization.awaitFullGc();
235235

236-
// If this test turns out to be flaky, add a second call to awaitFullGc()
237-
// GcFinalization.awaitFullGc();
236+
// Attempt to help with some flakiness that we've seen: b/387521512.
237+
GcFinalization.awaitFullGc();
238238

239239
assertEquals(0, finalizerRan.getCount());
240240
assertNull(ref.get());

guava-testlib/test/com/google/common/testing/GcFinalizationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ protected void finalize() {
233233
// Use e.g. awaitClear or await(CountDownLatch) instead.
234234
GcFinalization.awaitFullGc();
235235

236-
// If this test turns out to be flaky, add a second call to awaitFullGc()
237-
// GcFinalization.awaitFullGc();
236+
// Attempt to help with some flakiness that we've seen: b/387521512.
237+
GcFinalization.awaitFullGc();
238238

239239
assertEquals(0, finalizerRan.getCount());
240240
assertNull(ref.get());

0 commit comments

Comments
 (0)