260 |
|
SHORT_DELAY_MS = getShortDelay(); |
261 |
|
SMALL_DELAY_MS = SHORT_DELAY_MS * 5; |
262 |
|
MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10; |
263 |
< |
LONG_DELAY_MS = SHORT_DELAY_MS * 50; |
263 |
> |
LONG_DELAY_MS = SHORT_DELAY_MS * 200; |
264 |
|
} |
265 |
|
|
266 |
|
/** |
289 |
|
* earlier by threadRecordFailure. |
290 |
|
*/ |
291 |
|
public void tearDown() throws Exception { |
292 |
< |
Throwable t = threadFailure.get(); |
292 |
> |
Throwable t = threadFailure.getAndSet(null); |
293 |
|
if (t != null) { |
294 |
|
if (t instanceof Error) |
295 |
|
throw (Error) t; |
447 |
|
try { |
448 |
|
exec.shutdown(); |
449 |
|
assertTrue("ExecutorService did not terminate in a timely manner", |
450 |
< |
exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS)); |
450 |
> |
exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)); |
451 |
|
} catch (SecurityException ok) { |
452 |
|
// Allowed in case test doesn't have privs |
453 |
|
} catch (InterruptedException ie) { |