Clean up in ExpectingFailureRuleStatement - cherry-pick of #30944 to …

…release (#31355)
gradle · Nov 20, 2024 · b937017 · b937017
2 parents 69b756e + 76f03f8
commit b937017
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...sting/src/main/groovy/org/gradle/integtests/fixtures/ExpectingFailureRuleStatement.groovy b/...sting/src/main/groovy/org/gradle/integtests/fixtures/ExpectingFailureRuleStatement.groovy
@@ -16,6 +16,7 @@
 
 package org.gradle.integtests.fixtures
 
+import org.gradle.test.fixtures.file.AbstractTestDirectoryProvider
 import org.junit.runners.model.Statement
 
 class ExpectingFailureRuleStatement extends Statement {
@@ -39,6 +40,9 @@ class ExpectingFailureRuleStatement extends Statement {
         } catch (Throwable ex) {
             System.err.println("Failed with $feature as expected:")
             ex.printStackTrace()
+            if (next instanceof AbstractTestDirectoryProvider.TestDirectoryCleaningStatement) {
+                next.cleanup()
+            }
         }
     }
 }
diff --git a/...-testing/src/main/groovy/org/gradle/test/fixtures/file/AbstractTestDirectoryProvider.java b/...-testing/src/main/groovy/org/gradle/test/fixtures/file/AbstractTestDirectoryProvider.java
@@ -86,7 +86,7 @@ public Statement apply(final Statement base, Description description) {
         return new TestDirectoryCleaningStatement(base, description);
     }
 
-    private class TestDirectoryCleaningStatement extends Statement {
+    public class TestDirectoryCleaningStatement extends Statement {
         private final Statement base;
         private final Description description;
 
@@ -95,13 +95,9 @@ private class TestDirectoryCleaningStatement extends Statement {
             this.description = description;
         }
 
-        @Override
-        public void evaluate() throws Throwable {
-            // implicitly don't clean up if this throws
-            base.evaluate();
-
+        public void cleanup() {
             try {
-                cleanup();
+                AbstractTestDirectoryProvider.this.cleanup();
             } catch (Exception e) {
                 if (suppressCleanupErrors()) {
                     System.err.println(cleanupErrorMessage());
@@ -112,6 +108,15 @@ public void evaluate() throws Throwable {
             }
         }
 
+        @Override
+        public void evaluate() throws Throwable {
+            // implicitly don't clean up if this throws exceptions
+            // so that we can inspect the test directory
+            base.evaluate();
+
+            cleanup();
+        }
+
         private boolean suppressCleanupErrors() {
             return suppressCleanupErrors
                 || testClass().getAnnotation(LeaksFileHandles.class) != null