OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'security-stable-1.625' into security-master

Browse Source
This commit is contained in:
Jesse Glick committed 2015-11-05 17:03:30 -05:00
2 parents f76f795b44 3ac40d3cfe
commit 8fafe3ff86
9 files changed
+212 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/jenkins/slaves/DefaultJnlpSlaveReceiverTest.java
+4
View File
@@ -56,6 +56,8 @@ public class DefaultJnlpSlaveReceiverTest {
when(mockComputer.getChannel()).thenReturn(null);
when(mockChannel.getProperty(any(String.class))).thenReturn("some cookie");
when(mockHandshake.jnlpConnect(mockComputer)).thenReturn(mockChannel);
when(mockHandshake.getRequestProperty("Secret-Key")).thenReturn("mock-secret");
when(mockComputer.getJnlpMac()).thenReturn("mock-secret");
assertTrue(receiver.handle("node", mockHandshake));
verify(mockHandshake).success(any(Properties.class));
@@ -77,6 +79,8 @@ public class DefaultJnlpSlaveReceiverTest {
when(mockChannel.getProperty(any(String.class))).thenReturn("some cookie");
when(mockComputer.disconnect(any(ConnectionFromCurrentPeer.class))).thenReturn(mockFuture);
when(mockHandshake.jnlpConnect(mockComputer)).thenReturn(mockChannel);
when(mockHandshake.getRequestProperty("Secret-Key")).thenReturn("mock-secret");
when(mockComputer.getJnlpMac()).thenReturn("mock-secret");
assertTrue(receiver.handle("node", mockHandshake));
verify(mockFuture).get(15, TimeUnit.SECONDS);