From 3e35223eb77e19c72431495a16c2a30c8677ff07 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 5 Dec 2024 20:56:25 -0700 Subject: [PATCH] Remove test calls to isKubernetesCI() No benefit to calling a method that always returns false. The tests now require a docker environment, so they cannot be run on a Kubernetes agent. (cherry picked from commit 2ac8d0733af50859b1c235376e6b0e5ab2ee5add) --- .../AcceptFirstConnectionVerifierTest.java | 19 ------------------- .../verifier/KnownHostsFileVerifierTest.java | 6 ------ .../ManuallyProvidedKeyVerifierTest.java | 6 ------ .../verifier/NoHostKeyVerifierTest.java | 5 ----- 4 files changed, 36 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java index 7a4a0d7fcd..feb5b24b4e 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/AcceptFirstConnectionVerifierTest.java @@ -5,7 +5,6 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.hamcrest.io.FileMatchers.anExistingFile; -import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -49,9 +48,6 @@ public void testVerifyHostKeyOption() throws IOException { @Test public void testVerifyServerHostKeyWhenFirstConnection() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } File file = new File(testFolder.getRoot() + "path/to/file"); AcceptFirstConnectionVerifier acceptFirstConnectionVerifier = spy(new AcceptFirstConnectionVerifier()); when(acceptFirstConnectionVerifier.getKnownHostsFile()).thenReturn(file); @@ -76,9 +72,6 @@ public void testVerifyServerHostKeyWhenFirstConnection() throws Exception { @Test public void testVerifyServerHostKeyWhenSecondConnectionWithEqualKeys() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String hostKeyEntry = "|1|FJGXVAi7jMQIsl1J6uE6KnCiteM=|xlH92KQ91GuBgRxvRbU/sBo60Bo= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; @@ -107,9 +100,6 @@ public void testVerifyServerHostKeyWhenSecondConnectionWithEqualKeys() throws Ex @Test public void testVerifyServerHostKeyWhenHostnameWithoutPort() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String hostKeyEntry = "github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; File mockedKnownHosts = knownHostsTestUtil.createFakeKnownHosts(hostKeyEntry); @@ -133,9 +123,6 @@ public void testVerifyServerHostKeyWhenHostnameWithoutPort() throws Exception { @Test public void testVerifyServerHostKeyWhenSecondConnectionWhenNotDefaultAlgorithm() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String fileContent = "github.com,140.82.121.4" + " ecdsa-sha2-nistp256" + " AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; @@ -190,9 +177,6 @@ public void testVerifyServerHostKeyWhenSecondConnectionWithNonEqualKeys() throws @Test public void testVerifyServerHostKeyWhenConnectionWithAnotherHost() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String bitbucketFileContent = "|1|HnmPCP38pBhCY0NUtBXSraOg9pM=|L6YZ9asEeb2xplTDEThGOxRq7ZY=" + " ssh-rsa" + " AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw=="; @@ -222,9 +206,6 @@ public void testVerifyServerHostKeyWhenConnectionWithAnotherHost() throws Except @Test public void testVerifyServerHostKeyWhenHostnamePortProvided() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String fileContent = "|1|6uMj3M7sLgZpn54vQbGqgPNTCVM=|OkV9Lu9REJZR5QCVrITAIY34I1M=" // github.com:59666 + " ssh-ed25519" + " AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java index 483c64df53..2deb56baba 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/KnownHostsFileVerifierTest.java @@ -65,9 +65,6 @@ public void connectWhenHostKeyNotInKnownHostsFileForOtherHostNameThenShouldFail( @Test public void connectWhenHostKeyProvidedThenShouldNotFail() throws IOException { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } KnownHostsFileVerifier knownHostsFileVerifier = spy(new KnownHostsFileVerifier()); when(knownHostsFileVerifier.getKnownHostsFile()).thenReturn(fakeKnownHosts); @@ -88,9 +85,6 @@ public void connectWhenHostKeyProvidedThenShouldNotFail() throws IOException { @Test public void connectWhenHostKeyInKnownHostsFileWithNotDefaultAlgorithmThenShouldNotFail() throws IOException { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } fakeKnownHosts = knownHostsTestUtil.createFakeKnownHosts( "fake2.ssh", "known_hosts_fake2", diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java index d818d1216e..5889921914 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/ManuallyProvidedKeyVerifierTest.java @@ -60,9 +60,6 @@ public void connectWhenHostKeyProvidedForOtherHostNameThenShouldFail() throws Ex @Test public void connectWhenHostKeyProvidedThenShouldNotFail() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } ManuallyProvidedKeyVerifier verifier = new ManuallyProvidedKeyVerifier(hostKey); ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier jGitHostKeyVerifier = (ManuallyProvidedKeyVerifier.ManuallyProvidedKeyJGitHostKeyVerifier) @@ -100,9 +97,6 @@ public void connectWhenWrongHostKeyProvidedThenShouldFail() throws Exception { @Test public void connectWhenHostKeyProvidedWithPortThenShouldNotFail() throws Exception { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } String key = "github.com:22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg="; HostKeyVerifierFactory verifier = new ManuallyProvidedKeyVerifier(key); diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java index d2a7bdf327..c1ebca9fad 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/verifier/NoHostKeyVerifierTest.java @@ -2,7 +2,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.jenkinsci.plugins.gitclient.verifier.KnownHostsTestUtil.isKubernetesCI; import hudson.model.StreamBuildListener; import hudson.model.TaskListener; @@ -24,10 +23,6 @@ public void assignVerifier() { @Test public void verifyServerHostKey() throws IOException { - if (isKubernetesCI()) { - return; // Test fails with connection timeout on ci.jenkins.io kubernetes agents - } - NoHostKeyVerifier acceptFirstConnectionVerifier = new NoHostKeyVerifier(); KnownHostsTestUtil.connectToHost(