Merge pull request #20295 Fix issue with deadlocking between test tas…

…k and dependency resolution
gradle · Mar 29, 2022 · 72dedcb · 72dedcb
2 parents a41eb19 + 44c20b6
commit 72dedcb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...g-base/src/main/java/org/gradle/api/internal/tasks/testing/processors/TestMainAction.java b/...g-base/src/main/java/org/gradle/api/internal/tasks/testing/processors/TestMainAction.java
@@ -24,11 +24,8 @@
 import org.gradle.api.internal.tasks.testing.TestStartEvent;
 import org.gradle.api.internal.tasks.testing.results.AttachParentTestResultProcessor;
 import org.gradle.internal.time.Clock;
-import org.gradle.internal.work.WorkerLeaseRegistry;
 import org.gradle.internal.work.WorkerLeaseService;
 
-import java.util.Collections;
-
 public class TestMainAction implements Runnable {
     private final Runnable detector;
     private final TestClassProcessor processor;
@@ -58,9 +55,7 @@ public void run() {
                 detector.run();
             } finally {
                 // Release worker lease while waiting for tests to complete
-                // Do not release any other locks, so that other test tasks from the same project do not start running
-                WorkerLeaseRegistry.WorkerLease currentWorkerLease = workerLeaseService.getCurrentWorkerLease();
-                workerLeaseService.withoutLocks(Collections.singletonList(currentWorkerLease), new Runnable() {
+                workerLeaseService.blocking(new Runnable() {
                     @Override
                     public void run() {
                         processor.stop();

diff --git a/...rc/test/groovy/org/gradle/api/internal/tasks/testing/processors/TestMainActionTest.groovy b/...rc/test/groovy/org/gradle/api/internal/tasks/testing/processors/TestMainActionTest.groovy
@@ -43,8 +43,7 @@ class TestMainActionTest extends Specification {
         then:
         1* detector.run()
         then:
-        1 * workerLeaseService.currentWorkerLease >> lease
-        1 * workerLeaseService.withoutLocks([lease], _) >> { l, Runnable runnable -> runnable.run() }
+        1 * workerLeaseService.blocking(_) >> { Runnable runnable -> runnable.run() }
         1 * processor.stop()
         then:
         1 * timeProvider.getCurrentTime() >> 200L
@@ -68,8 +67,7 @@ class TestMainActionTest extends Specification {
         then:
         1 * detector.run() >> { throw failure }
         then:
-        1 * workerLeaseService.currentWorkerLease >> lease
-        1 * workerLeaseService.withoutLocks([lease], _) >> { l, Runnable runnable -> runnable.run() }
+        1 * workerLeaseService.blocking(_) >> { Runnable runnable -> runnable.run() }
         1 * processor.stop()
         then:
         1 * resultProcessor.completed(!null, !null)
@@ -119,8 +117,7 @@ class TestMainActionTest extends Specification {
         then:
         1 * detector.run()
         then:
-        1 * workerLeaseService.currentWorkerLease >> lease
-        1 * workerLeaseService.withoutLocks([lease], _) >> { l, Runnable runnable -> runnable.run() }
+        1 * workerLeaseService.blocking(_) >> { Runnable runnable -> runnable.run() }
         1 * processor.stop() >> { throw failure }
         then:
         1 * resultProcessor.completed(!null, !null)