Merge branch 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' into...

 Conflicts:
	test/jalview/bin/CommandLineOperations.java

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index d829aae..ee03e77 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -226,7 +226,7 @@ public class CommandLineOperations
   public void setUpForHeadlessCommandLineInputOperations()
           throws IOException
   {
-    String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/io/testProps.jvprops -colour zappo "
+    String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/bin/testProps.jvprops -colour zappo "
             + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree "
             + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree";
     Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT);
@@ -252,7 +252,7 @@ public class CommandLineOperations
     
     // number of lines expected on STDERR when Jalview starts up normally
     // may need to adjust this if Jalview is excessively noisy ?
-    final int STDERR_SETUPLINES=50;
+    final int STDERR_SETUPLINES=30;
     
     // thread monitors stderr - bails after SETUP_TIMEOUT or when
     // STDERR_SETUPLINES have been read
@@ -345,7 +345,7 @@ public class CommandLineOperations
         // headless mode input operations
         { "CMD [-color zappo] executed successfully!",
             "Failed command : -color zappo" },
-        { "CMD [-props test/jalview/io/testProps.jvprops] executed successfully!",
+        { "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!",
             "Failed command : -props File" },
         { "CMD [-sortbytree] executed successfully!",
             "Failed command : -sortbytree" },

diff --git a/test/jalview/bin/testProps.jvprops b/test/jalview/bin/testProps.jvprops
index a1ab82a..7018dc4 100644 (file)
--- a/test/jalview/bin/testProps.jvprops
+++ b/test/jalview/bin/testProps.jvprops
@@ -1,2 +1,3 @@
 VERSION_CHECK=true
 LATEST_VERSION=test
+logs.Jalview.level=INFO