Merge pull request #2753 from jglick/Security232Test

Security232Test seems flaky
jenkinsci · Feb 17, 2017 · 83232e6 · 83232e6
2 parents dc7b702 + 88cd913
commit 83232e6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/test/src/test/java/jenkins/security/Security232Test.java b/test/src/test/java/jenkins/security/Security232Test.java
@@ -19,6 +19,7 @@
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.rmi.activation.ActivationDesc;
@@ -34,6 +35,7 @@
 import jenkins.security.security218.ysoserial.payloads.CommonsCollections1;
 import jenkins.security.security218.ysoserial.payloads.ObjectPayload;
 import static org.junit.Assert.*;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -82,7 +84,11 @@ public void commonsCollections1() throws Exception {
             dos.writeUTF("Protocol:CLI-connect");
 
             ExecutorService cp = Executors.newCachedThreadPool();
-            c = new ChannelBuilder("EXPLOIT", cp).withMode(Mode.BINARY).build(s.getInputStream(), outputStream);
+            try {
+                c = new ChannelBuilder("EXPLOIT", cp).withMode(Mode.BINARY).build(s.getInputStream(), outputStream);
+            } catch (SocketException x) {
+                Assume.assumeNoException("failed to connect to CLI", x);
+            }
 
             System.err.println("* Channel open");