git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5526e66
)
JAL-2864 more generous wait for gc() to complete in test
bug/JAL-2864nullOverviewCanvas
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 12 Jan 2018 12:14:49 +0000
(12:14 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 12 Jan 2018 12:14:49 +0000
(12:14 +0000)
test/jalview/gui/FreeUpMemoryTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/gui/FreeUpMemoryTest.java
b/test/jalview/gui/FreeUpMemoryTest.java
index
78beb31
..
9b21274
100644
(file)
--- a/
test/jalview/gui/FreeUpMemoryTest.java
+++ b/
test/jalview/gui/FreeUpMemoryTest.java
@@
-84,18
+84,19
@@
public class FreeUpMemoryTest
protected void checkUsedMemory(long expectedMax)
{
/*
protected void checkUsedMemory(long expectedMax)
{
/*
- * request garbage collection and wait briefly for it to run;
+ * request garbage collection and wait for it to run;
* NB there is no guarantee when, or whether, it will do so
* NB there is no guarantee when, or whether, it will do so
+ * wait time depends on JRE/processor, generous allowance here
*/
System.gc();
*/
System.gc();
- waitFor(100);
+ waitFor(1500);
/*
* a second gc() call should not be necessary - but it is!
* the test passes with it, and fails without it
*/
System.gc();
/*
* a second gc() call should not be necessary - but it is!
* the test passes with it, and fails without it
*/
System.gc();
- waitFor(100);
+ waitFor(1500);
/*
* check used memory is 'reasonably low'
/*
* check used memory is 'reasonably low'