ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JavaTest.java ExecTaskTest.java
Date Sun, 08 Feb 2004 17:41:10 GMT
antoine     2004/02/08 09:41:10

  Modified:    src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_16_BRANCH JavaTest.java ExecTaskTest.java
  Log:
  Merge from HEAD
  Give one second more for these tests to succeed
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.17.2.3  +2 -2      ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
  
  Index: JavaTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java,v
  retrieving revision 1.17.2.2
  retrieving revision 1.17.2.3
  diff -u -r1.17.2.2 -r1.17.2.3
  --- JavaTest.java	4 Feb 2004 21:59:16 -0000	1.17.2.2
  +++ JavaTest.java	8 Feb 2004 17:41:09 -0000	1.17.2.3
  @@ -31,10 +31,10 @@
    * */
   public class JavaTest extends BuildFileTest {
   
  -    private static final int TIME_TO_WAIT = 4;
  +    private static final int TIME_TO_WAIT = 1;
       // wait 1 second extra to allow for java to start ...
       // this time was OK on a Win NT machine and on nagoya
  -    private static final int SECURITY_MARGIN = 1000;
  +    private static final int SECURITY_MARGIN = 2000;
   
       private boolean runFatalTests=false;
   
  
  
  
  1.6.2.3   +4 -3      ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java
  
  Index: ExecTaskTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- ExecTaskTest.java	4 Feb 2004 21:59:16 -0000	1.6.2.2
  +++ ExecTaskTest.java	8 Feb 2004 17:41:09 -0000	1.6.2.3
  @@ -32,10 +32,10 @@
   public class ExecTaskTest extends BuildFileTest {
       private static final String BUILD_PATH = "src/etc/testcases/taskdefs/exec/";
       private static final String BUILD_FILE = BUILD_PATH + "exec.xml";
  -    private final int TIME_TO_WAIT = 4;
  +    private final int TIME_TO_WAIT = 1;
       /** maximum time allowed for the build in milliseconds */
       private final int MAX_BUILD_TIME = 4000;
  -    private final int SECURITY_MARGIN = 1000; // wait 1 second extras
  +    private final int SECURITY_MARGIN = 2000; // wait 2 second extras
       // the test failed with 100 ms of margin on cvs.apache.org on August 1st, 2003
       private File logFile;
       private MonitoredBuild myBuild = null;
  @@ -92,7 +92,8 @@
           }
           // time of the build in milli seconds
           long elapsed = myBuild.getTimeElapsed();
  -        assertTrue("we waited more than the process lasted", TIME_TO_WAIT * 1000 > elapsed);
  +        assertTrue("we waited more than the process lasted", TIME_TO_WAIT * 1000
  +                + SECURITY_MARGIN > elapsed);
           logFile = new File(logFile.getAbsolutePath());
           assertTrue("log file found after spawn", logFile.exists());
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message