Merge "Increase timeout for flaky WeakHashMap.test_keySet()"

am: 171ae55

Change-Id: I4671cb85dbfded8f7a7781b5bb08d370ac8019f7

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java

@@ -310,14 +310,20 @@ public void test_keySet() {
         long startTime = System.currentTimeMillis();
         // We use a busy wait loop here since we cannot know when the ReferenceQueue
         // daemon will enqueue the cleared references on their internal reference
-        // queues. The current timeout is 5 seconds.
+        // queues.
+        // The timeout after which the reference should be cleared. This test used to
+        // be flaky when it was set to 5 seconds. Daemons.MAX_FINALIZE_NANOS is
+        // currently 10 seconds so that seems like the correct value.
+        // We allow an extra 500msec buffer to minimize races between finalizer,
+        // keySet.size() evaluation and time check.
+        long timeout = 10000 + 500;
         do {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
             }
         } while (keySet.size() != 99 &&
-                 System.currentTimeMillis() - startTime < 5000);
+                 System.currentTimeMillis() - startTime < timeout);
 
         assertEquals("Incorrect number of keys returned after gc,", 99, keySet.size());
     }