commit 23611d7f01f91501423cef28e51da84ea9a1bbf9
author Mathieu Chartier <mathieuc@google.com> Mon Jun 23 10:09:06 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Jul 08 15:40:19 2014 -0700
tree b3714c5b2cd3c8fff7f50fb480c799185e992151
parent 2bc5e811a817a8c667bca4318ae98582b0ee6dc6

Fix race condition in WeakHashMapTest.

There was a race condition where the reference queue daemon wouldn't
necessarily have processed the cleared references by the time we
called WeakHashMap.size(). The race is fixed by doing a busy wait
with a 5 second timeout. This should't increase the test time in the
average case since the cleared weak references should be processed
shortly after induceFinalization finishes.

Bug: 15775475

Change-Id: Id5a532c2a9b3377641523aaed67f1b48a8ec632b

(cherry picked from commit 97afbd7972a43345ea12eb442b2a4e473b03d881)