|
45 | 45 | import hudson.security.ACLContext; |
46 | 46 | import java.io.IOError; |
47 | 47 | import java.io.IOException; |
| 48 | +import java.util.concurrent.atomic.AtomicInteger; |
| 49 | + |
48 | 50 | import jenkins.model.Jenkins; |
49 | 51 | import net.sf.json.JSONNull; |
50 | 52 | import net.sf.json.JSONObject; |
@@ -201,6 +203,45 @@ public void onOnline(Computer c, TaskListener listener) { |
201 | 203 | } |
202 | 204 | } |
203 | 205 | } |
| 206 | + @Test |
| 207 | + @Issue("JENKINS-35272") |
| 208 | + void afterDisconnectShouldBeCalledOnlyOnce() throws Exception { |
| 209 | + DumbSlave node = j.createOnlineSlave(); |
| 210 | + SlaveComputer computer = (SlaveComputer) node.getComputer(); |
| 211 | + assertNotNull(computer); |
| 212 | + |
| 213 | + // Reset counter before test |
| 214 | + AfterDisconnectListener.reset(); |
| 215 | + |
| 216 | + // Trigger disconnect twice |
| 217 | + computer.disconnect(null); |
| 218 | + computer.disconnect(null); |
| 219 | + |
| 220 | + // Wait until Jenkins finishes processing |
| 221 | + j.waitUntilNoActivity(); |
| 222 | + |
| 223 | + assertEquals(1, AfterDisconnectListener.count.get(), |
| 224 | + "afterDisconnect should be called exactly once"); |
| 225 | + } |
| 226 | + |
| 227 | + @TestExtension |
| 228 | + public static class AfterDisconnectListener extends ComputerListener { |
| 229 | + |
| 230 | + static final AtomicInteger count = new AtomicInteger(); |
| 231 | + |
| 232 | + static void reset() { |
| 233 | + count.set(0); |
| 234 | + } |
| 235 | + |
| 236 | + @Override |
| 237 | + public void onOffline(Computer c, OfflineCause cause) { |
| 238 | + if (c instanceof SlaveComputer) { |
| 239 | + count.incrementAndGet(); |
| 240 | + } |
| 241 | + } |
| 242 | + } |
| 243 | + |
| 244 | + |
204 | 245 |
|
205 | 246 |
|
206 | 247 | /** |
|
0 commit comments