From 704fbcf5ff632ef65bd265d7068364439403da08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scheibe?= Date: Sat, 12 Oct 2019 16:24:42 +0200 Subject: [PATCH] Resolve TODO using JenkinsRule#waitOnline --- .../java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java index 43400d0b7c..6585b0fc0b 100644 --- a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java +++ b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java @@ -126,9 +126,7 @@ public class JnlpAccessWithSecuredHudsonTest { cmds(JavaEnvUtils.getJreExecutable("java"), "-jar", slaveJar.getAbsolutePath(), "-jnlpUrl", r.getURL() + "computer/test/slave-agent.jnlp", "-secret", secret). start(); try { - while (!slave.toComputer().isOnline()) { // TODO can use r.waitOnline(slave) after https://github.com/jenkinsci/jenkins-test-harness/pull/80 - Thread.sleep(100); - } + r.waitOnline(slave); Channel channel = slave.getComputer().getChannel(); assertFalse("SECURITY-206", channel.isRemoteClassLoadingAllowed()); r.jenkins.getExtensionList(AdminWhitelistRule.class).get(AdminWhitelistRule.class).setMasterKillSwitch(false); -- GitLab