bodewig 2004/03/03 06:35:24
Modified: src/testcases/org/apache/tools/ant/taskdefs JarTest.java
Log:
This test has been randomly failing on Unix systems ever since their
file system is considered to have a granularity of a second. Give it
the same treatment as Windows.
Revision Changes Path
1.28 +3 -4
ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JarTest.java 9 Feb 2004 21:05:41 -0000 1.27
+++ JarTest.java 3 Mar 2004 14:35:24 -0000 1.28
@@ -30,6 +30,7 @@
import java.util.zip.ZipFile;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.util.FileUtils;
/**
* @author Erik Meade <[EMAIL PROTECTED]>
@@ -124,10 +125,8 @@
private void testRecreate(String firstTarget, String secondTarget) {
executeTarget(firstTarget);
- int sleeptime = 2500;
- if (Os.isFamily("windows")) {
- sleeptime += 2500;
- }
+ long sleeptime = 3000
+ + FileUtils.newFileUtils().getFileTimestampGranularity();
try {
Thread.currentThread().sleep(sleeptime);
} catch (InterruptedException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
