Make sure to unblock in tear down

Author: michaelklishin

projects/client/Unit/src/unit/TestConnectionBlocked.cs

@@ -54,7 +54,7 @@
 
 namespace RabbitMQ.Client.Unit {
     [TestFixture]
-    public class TestConnectionBlocked {
+    public class TestConnectionBlocked : IntegrationFixture {
 
         Object lockObject = new Object();
         UTF8Encoding enc = new UTF8Encoding();
@@ -63,19 +63,21 @@ public class TestConnectionBlocked {
         [Test]
         public void TestConnectionBlockedNotification()
         {
-	    ConnectionFactory cf = new ConnectionFactory();
-	    IConnection conn = cf.CreateConnection();
-
-	    conn.ConnectionBlocked   += new ConnectionBlockedEventHandler(HandleBlocked);
-	    conn.ConnectionUnblocked += new ConnectionUnblockedEventHandler(HandleUnblocked);
+	    Conn.ConnectionBlocked   += new ConnectionBlockedEventHandler(HandleBlocked);
+	    Conn.ConnectionUnblocked += new ConnectionUnblockedEventHandler(HandleUnblocked);
 
 	    Block();
-	    Publish(conn);
-	    Monitor.Wait(TimeSpan.FromSeconds(10));
-
-	    Assert.IsTrue(notified);
+	    Publish(Conn);
+	    lock (lockObject) {
+	        if(!notified) {
+	            Monitor.Wait(lockObject, TimeSpan.FromSeconds(10));
+	        }
+                Assert.IsTrue(notified);
+	    }
         }
 
+
+
         public void HandleBlocked(IConnection sender, ConnectionBlockedEventArgs args)
         {
 	    Unblock();
@@ -104,7 +106,7 @@ protected void ExecRabbitMQCtl(string command)
 	    if(IsRunningOnMono()) {
 	        ExecCommand("../rabbitmq-server/scripts/rabbitmqctl " + command);
 	    } else {
-		ExecCommand("..\\rabbitmq-server\\scripts\\rabbitmqctl " + command);
+		ExecCommand("..\\rabbitmq-server\\scripts\\rabbitmqctl.bat " + command);
 	    }
 	}
 
@@ -143,5 +145,10 @@ protected void Publish(IConnection conn)
 	    IModel ch = conn.CreateModel();
 	    ch.BasicPublish("", "amq.fanout", null, enc.GetBytes("message"));
         }
+
+        protected override void ReleaseResources()
+        {
+	    Unblock();
+        }
     }
 }