From 383b90eaf5b9b296c228836316357989ea157a02 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 3 Oct 2014 16:31:03 -0400
Subject: [PATCH] waitUntilNoActivityUpTo should list OneOffExecutable.executor
 if that is the problem.

---
 test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
index d2b8b69c09..3c2eb13150 100644
--- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -1483,6 +1483,10 @@ public class JenkinsRule implements TestRule, MethodRule, RootAction {
                         if (e.isBusy())
                             building.add(e.getCurrentExecutable());
                     }
+                    for (Executor e : c.getOneOffExecutors()) {
+                        if (e.isBusy())
+                            building.add(e.getCurrentExecutable());
+                    }
                 }
                 dumpThreads();
                 throw new AssertionError(String.format("Jenkins is still doing something after %dms: queue=%s building=%s",
-- 
GitLab