IO-161 Try to reduce test failures

Niall Pemberton · Niall Pemberton · commit c681da4a8412 · 2010-10-09T01:09:25.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1006091 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java b/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java
@@ -155,7 +155,7 @@ public void testFileCleanerDirectory_ForceStrategy() throws Exception {
         pauseForDeleteToComplete(testFile.getParentFile());
         
         assertEquals(0, theInstance.getTrackCount());
-        assertEquals(showFailures(), false, testFile.exists());
+        assertEquals(showFailures(), false, new File(testFile.getPath()).exists());
         assertEquals(showFailures(), false, testFile.getParentFile().exists());
     }
 
@@ -283,10 +283,14 @@ public void testFileCleanerExitWhenFinished2() throws Exception {
     }
 
     //-----------------------------------------------------------------------
-    private void pauseForDeleteToComplete(File file) throws Exception {
+    private void pauseForDeleteToComplete(File file) {
         int count = 0;
-        while(file.exists() && count++ < 20) {
-            Thread.sleep(500L);
+        while(file.exists() && count++ < 40) {
+            try {
+                Thread.sleep(500L);
+            } catch (InterruptedException e) {
+            }
+            file = new File(file.getPath());
         }
     }
     private String showFailures() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public void testFileCleanerDirectory_ForceStrategy() throws Exception {`
`155`	`155`	`pauseForDeleteToComplete(testFile.getParentFile());`
`156`	`156`
`157`	`157`	`assertEquals(0, theInstance.getTrackCount());`
`158`		`- assertEquals(showFailures(), false, testFile.exists());`
	`158`	`+ assertEquals(showFailures(), false, new File(testFile.getPath()).exists());`
`159`	`159`	`assertEquals(showFailures(), false, testFile.getParentFile().exists());`
`160`	`160`	`}`
`161`	`161`
`@@ -283,10 +283,14 @@ public void testFileCleanerExitWhenFinished2() throws Exception {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`//-----------------------------------------------------------------------`
`286`		`- private void pauseForDeleteToComplete(File file) throws Exception {`
	`286`	`+ private void pauseForDeleteToComplete(File file) {`
`287`	`287`	`int count = 0;`
`288`		`- while(file.exists() && count++ < 20) {`
`289`		`- Thread.sleep(500L);`
	`288`	`+ while(file.exists() && count++ < 40) {`
	`289`	`+ try {`
	`290`	`+ Thread.sleep(500L);`
	`291`	`+ } catch (InterruptedException e) {`
	`292`	`+ }`
	`293`	`+ file = new File(file.getPath());`
`290`	`294`	`}`
`291`	`295`	`}`
`292`	`296`	`private String showFailures() throws Exception {`