[WFCORE-634] Intermittent failures in SSLMasterSlaveOneWayTestCase fixed

wildfly · Apr 10, 2015 · 72378c2 · 72378c2
1 parent bae7405
commit 72378c2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/...in/src/test/java/org/jboss/as/test/integration/domain/AbstractSSLMasterSlaveTestCase.java b/...in/src/test/java/org/jboss/as/test/integration/domain/AbstractSSLMasterSlaveTestCase.java
@@ -34,7 +34,6 @@
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.BasicCredentialsProvider;
@@ -142,7 +141,7 @@ private static boolean isHostStateRunning(URI mgmtURI, String operation) throws
         ModelNode responseNode;
         try {
             responseNode = executeOverHttp(mgmtURI, operation);
-        } catch (HttpHostConnectException ex) {
+        } catch (IOException ex) {
             // connection refused, host is not running
             return false;
         }

diff --git a/...main/src/test/java/org/jboss/as/test/integration/domain/SSLMasterSlaveOneWayTestCase.java b/...main/src/test/java/org/jboss/as/test/integration/domain/SSLMasterSlaveOneWayTestCase.java
@@ -45,15 +45,13 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests one way SSL secured communication between master and slave.
  *
  * @author Ondrej Kotek <okotek@redhat.com>
  */
-@Ignore("WFCORE-634")
 public class SSLMasterSlaveOneWayTestCase extends AbstractSSLMasterSlaveTestCase {
 
     private static final File WORK_DIR = new File("target" + File.separatorChar +  "ssl-master-slave-1way-workdir");