Merge branch 'security-stable-2.89' into security-stable-2.107

This commit is contained in:
Daniel Beck committed 2018-04-26 01:20:01 +02:00
commit 7e6c0637b1
14 files changed
+673 -16

No files matched your search

+2 -2
View File
@@ -625,7 +625,7 @@ public class FilePathTest {
when(con.getResponseCode())
.thenReturn(HttpURLConnection.HTTP_NOT_MODIFIED);
assertFalse(d.installIfNecessaryFrom(url, null, ""));
assertFalse(d.installIfNecessaryFrom(url, null, "message if failed"));
verify(con).setIfModifiedSince(123000);
}
@@ -644,7 +644,7 @@ public class FilePathTest {
when(con.getInputStream())
.thenReturn(someZippedContent());
assertTrue(d.installIfNecessaryFrom(url, null, ""));
assertTrue(d.installIfNecessaryFrom(url, null, "message if failed"));
}
@Issue("JENKINS-26196")