git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4026 increase timeouts for command line ops
[jalview.git]
/
test
/
jalview
/
bin
/
CommandLineOperations.java
diff --git
a/test/jalview/bin/CommandLineOperations.java
b/test/jalview/bin/CommandLineOperations.java
index
2d8ebce
..
3bfd4f3
100644
(file)
--- a/
test/jalview/bin/CommandLineOperations.java
+++ b/
test/jalview/bin/CommandLineOperations.java
@@
-23,8
+23,6
@@
package jalview.bin;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
-import jalview.gui.JvOptionPane;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@
-43,6
+41,7
@@
import org.testng.annotations.Test;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ModuleRef;
import io.github.classgraph.ScanResult;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ModuleRef;
import io.github.classgraph.ScanResult;
+import jalview.gui.JvOptionPane;
public class CommandLineOperations
{
public class CommandLineOperations
{
@@
-54,12
+53,12
@@
public class CommandLineOperations
JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
}
JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
}
- private static final int TEST_TIMEOUT = 12500; // Note longer timeout needed
+ private static final int TEST_TIMEOUT = 13000; // Note longer timeout needed
// on
// full test run than on
// individual tests
// on
// full test run than on
// individual tests
- private static final int SETUP_TIMEOUT = 9000;
+ private static final int SETUP_TIMEOUT = 9500;
private static final int MINFILESIZE_SMALL = 2096;
private static final int MINFILESIZE_SMALL = 2096;
@@
-257,6
+256,7
@@
public class CommandLineOperations
// STDERR_SETUPLINES have been read
Thread runner = new Thread(new Runnable()
{
// STDERR_SETUPLINES have been read
Thread runner = new Thread(new Runnable()
{
+ @Override
public void run()
{
String ln = null;
public void run()
{
String ln = null;