Adapt tests to RabbitMQ 3.0 - immediate is not supported any more

majek · Dec 19, 2012 · d06c1be · d06c1be
1 parent cd59bb6
commit d06c1be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -148,12 +148,6 @@ def test_basic_return(self):
                                        mandatory=True, body='')
         client.wait(promise) # no error
 
-        promise = client.basic_publish(exchange='', routing_key=self.name,
-                                       immediate=True, body='')
-        with self.assertRaises(puka.NoConsumers):
-            r = client.wait(promise)
-            print r
-
         promise = client.queue_delete(queue=self.name)
         client.wait(promise)
 

diff --git a/tests/test_publish_async.py b/tests/test_publish_async.py
@@ -83,8 +83,8 @@ def test_return(self):
         client.wait(promise)
 
         promise = client.basic_publish(exchange='', routing_key='',
-                                       body=self.msg, immediate=True)
-        with self.assertRaises(puka.NoConsumers):
+                                       body=self.msg, mandatory=True)
+        with self.assertRaises(puka.NoRoute):
             client.wait(promise)
 
 
@@ -97,13 +97,13 @@ def test_return_2(self):
         client.wait(promise)
 
         promise = client.basic_publish(exchange='', routing_key='badname',
-                                       immediate=True, body=self.msg)
+                                       mandatory=True, body=self.msg)
         try:
             client.wait(promise)
-        except puka.NoConsumers, (response,):
+        except puka.NoRoute, (response,):
             pass
 
-        self.assertEqual(response['reply_code'], 313)
+        self.assertEqual(response['reply_code'], 312)
 
         promise = client.queue_delete(queue=self.name)
         client.wait(promise)