2 files changed, 0 insertions, 111 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 95edcd353b..e79fe69199 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -272,113 +272,5 @@ public class AMQConnectionTest extends QpidBrokerTestCase
             }
         }
     }
-    
-    /**
-     * Test Strategy : Kill -STOP the broker and see
-     * if the client terminates the connection with a
-     * read timeout.
-     * The broker process is cleaned up in the test itself
-     * and avoids using process.waitFor() as it hangs. 
-     */
-    public void testHeartBeat() throws Exception
-    {
-       boolean windows = 
-            ((String) System.getProperties().get("os.name")).matches("(?i).*windows.*");
- 
-       if (!isCppBroker() || windows)
-       {
-           return;
-       }
-       
-       Process process = null;
-       int port = getPort(0);
-       String pid = null;
-       try
-       {
-           // close the connection and shutdown the broker started by QpidTest
-           _connection.close();
-           stopBroker(port);
-           
-           setSystemProperty("qpid.heartbeat", "1");
-           
-           // in case this broker gets stuck, atleast the rest of the tests will not fail.
-           port = port + 200;
-           String startCmd = getBrokerCommand(port);
-           
-           // start a broker using a script
-           ProcessBuilder pb = new ProcessBuilder(System.getProperty("broker.start"));
-           pb.redirectErrorStream(true);
-
-           Map<String, String> env = pb.environment();
-           env.put("BROKER_CMD",startCmd);
-           env.put("BROKER_READY",System.getProperty(BROKER_READY));
-           
-           Process startScript = pb.start();
-           startScript.waitFor();
-           startScript.destroy();
-           
-           Connection con = 
-               new AMQConnection("amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:" + port + "'");
-           final AtomicBoolean lock = new AtomicBoolean(false);
-           
-           String cmd = "/usr/bin/pgrep -f " + port;
-           process = Runtime.getRuntime().exec("/bin/bash");
-           LineNumberReader reader = new LineNumberReader(new InputStreamReader(process.getInputStream()));
-           PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(process.getOutputStream())), true); 
-           out.println(cmd); 
-           pid = reader.readLine();
-           try
-           {
-               Integer.parseInt(pid);
-           }
-           catch (NumberFormatException e) 
-           {
-               // Error! try to read further to gather the error msg.
-               String line;
-               _logger.debug(pid);
-               while ((line = reader.readLine()) != null )
-               {
-                   _logger.debug(line);
-               }
-               throw new Exception( "Unable to get the brokers pid " + pid);
-           }
-           _logger.debug("pid : " + pid);
-           
-           con.setExceptionListener(new ExceptionListener(){
-               
-               public void onException(JMSException e)
-               {
-                   synchronized(lock) {
-                       lock.set(true);
-                       lock.notifyAll();
-                  }
-               }           
-           });   
 
-           out.println("kill -STOP " + pid);           
-           
-           synchronized(lock){
-               lock.wait(2500);
-           }
-           out.close();
-           reader.close();
-           assertTrue("Client did not terminate the connection, check log for details",lock.get());
-       }
-       catch(Exception e)
-       {
-           throw e;
-       }
-       finally
-       {           
-           if (process != null)
-           {
-               process.destroy();
-           }
-           
-           Process killScript = Runtime.getRuntime().exec(System.getProperty("broker.kill") + " " + pid);
-           killScript.waitFor();
-           killScript.destroy();
-           cleanBroker();
-       }
-    }
 }
diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes
index 89cdd792de..8c05b28161 100755
--- a/java/test-profiles/CPPExcludes
+++ b/java/test-profiles/CPPExcludes
@@ -144,9 +144,6 @@ org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#*
 
 org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#*
 
-// Temporarily adding the following until the issues are sorted out.
-org.apache.qpid.test.unit.client.AMQConnectionTest#testHeartBeat
-
 //Excluded due to QPID-1447 : CPP broker does not have SlowConsumer Disconnection
 org.apache.qpid.systest.GlobalQueuesTest#*
 org.apache.qpid.systest.GlobalTopicsTest#*