merge bug25631 into stable

Author: rade

test/src/com/rabbitmq/client/test/BrokerTestCase.java

@@ -83,10 +83,15 @@ protected void releaseResources()
     protected void restart()
             throws IOException {
         tearDown();
-        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        bareRestart();
         setUp();
     }
 
+    protected void bareRestart()
+            throws IOException {
+        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+    }
+
     public void openConnection()
             throws IOException {
         if (connection == null) {

test/src/com/rabbitmq/client/test/server/Shutdown.java

@@ -0,0 +1,17 @@
+package com.rabbitmq.client.test.server;
+
+import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+
+import java.io.IOException;
+
+public class Shutdown extends BrokerTestCase {
+
+    public void testErrorOnShutdown() throws Exception {
+        bareRestart();
+        expectError(AMQP.CONNECTION_FORCED);
+    }
+
+}