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

 Conflicts:
	test/jalview/bin/CommandLineOperations.java

diff --combined test/jalview/bin/CommandLineOperations.java
index d829aae,6bf1505..ee03e77
--- 1/test/jalview/bin/CommandLineOperations.java
--- 2/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@@ -54,7 -54,7 +54,7 @@@ public class CommandLineOperation
      JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
    }
  
 -  private static final int TEST_TIMEOUT = 10500; // Note longer timeout needed
 +  private static final int TEST_TIMEOUT = 12500; // Note longer timeout needed
                                                  // on
                                                  // full test run than on
                                                  // individual tests
@@@ -226,7 -226,7 +226,7 @@@
    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);
@@@ -246,53 -246,18 +246,53 @@@
    public void setUpForCommandLineInputOperations() throws IOException
    {
      String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
 -    Worker worker = getJalviewDesktopRunner(false, cmds, SETUP_TIMEOUT);
 -    String ln = null;
 -    int count = 0;
 -    while ((ln = worker.getErrorReader().readLine()) != null)
 +    final Worker worker = getJalviewDesktopRunner(false, cmds,
 +            SETUP_TIMEOUT);
 +    
 +    
 +    // 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
 +    Thread runner = new Thread(new Runnable()
      {
 -      System.out.println(ln);
 -      successfulCMDs.add(ln);
 -      if (++count > 30)
 +      public void run()
 +      {
 +        String ln = null;
 +        int count = 0;
 +        try
 +        {
 +          while ((ln = worker.getErrorReader().readLine()) != null)
 +          {
 +            System.out.println(ln);
 +            successfulCMDs.add(ln);
 +            if (++count > STDERR_SETUPLINES)
 +            {
 +              break;
 +            }
 +          }
 +        } catch (Exception e)
 +        {
 +          System.err.println(
 +                  "Unexpected Exception reading stderr from the Jalview process");
 +          e.printStackTrace();
 +        }
 +      }
 +    });
 +    long t = System.currentTimeMillis() + SETUP_TIMEOUT;
 +    runner.start();
 +    while (!runner.isInterrupted() && System.currentTimeMillis() < t)
 +    {
 +      try
 +      {
 +        Thread.sleep(500);
 +      } catch (InterruptedException e)
        {
 -        break;
        }
      }
 +    runner.interrupt();
      if (worker != null && worker.exit == null)
      {
        worker.interrupt();
@@@ -345,7 -310,7 +345,7 @@@
          // 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" },