From 56cee9518a2da6f01848eb08640c90ad07480c93 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 4 Apr 2017 11:11:40 -0400 Subject: [PATCH] Found another case where the Windows CI build was complaining about known_hosts metadata. --- test/src/test/java/hudson/cli/CLITest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/src/test/java/hudson/cli/CLITest.java b/test/src/test/java/hudson/cli/CLITest.java index 69ebcaa11e..ee4f7c4723 100644 --- a/test/src/test/java/hudson/cli/CLITest.java +++ b/test/src/test/java/hudson/cli/CLITest.java @@ -41,7 +41,8 @@ import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.TeeOutputStream; -import static org.hamcrest.Matchers.containsString; +import org.apache.sshd.common.util.io.ModifiableFileWatcher; +import static org.hamcrest.Matchers.*; import org.jenkinsci.main.modules.cli.auth.ssh.UserPropertyImpl; import org.jenkinsci.main.modules.sshd.SSHD; import static org.junit.Assert.*; @@ -82,6 +83,8 @@ public class CLITest { } catch (IOException x) { assumeNoException("Sometimes on Windows KnownHostsServerKeyVerifier.acceptIncompleteHostKeys says WARNING: Failed (FileSystemException) to reload server keys from …\\\\.ssh\\\\known_hosts: … Incorrect function.", x); } + assumeThat("or on Windows DefaultKnownHostsServerKeyVerifier.reloadKnownHosts says invalid file permissions: Owner violation (Administrators)", + ModifiableFileWatcher.validateStrictConfigFilePermissions(known_hosts.toPath()), nullValue()); r.jenkins.setSecurityRealm(r.createDummySecurityRealm()); r.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy().grant(Jenkins.ADMINISTER).everywhere().to("admin")); SSHD.get().setPort(0); -- GitLab