Merge lp:~jtv/maas/disable-rabbit-tests into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Temporarily disable TestRabbitMessaging tests (as per bug 1225980).

See bug 1225980 for the details. We should re-enable this as soon as possible.

Jeroen

[Gavin Panella (allenap)]

Can you use the unittest.skip decorator instead of commenting out the code? There are existing examples in the tree.

review: Approve

=== modified file 'src/maasserver/tests/test_rabbit.py'
--- src/maasserver/tests/test_rabbit.py	2013-09-13 10:10:55 +0000
+++ src/maasserver/tests/test_rabbit.py	2013-09-17 04:24:36 +0000
@@ -15,6 +15,7 @@
 
 import socket
 import time
+from unittest import skip
 
 from amqplib import client_0_8 as amqp
 from django.conf import settings
@@ -78,6 +79,7 @@
 
 class TestRabbitMessaging(MAASTestCase):
 
+    @skip("XXX bug=1225980: This breaks on the lander.")
     @uses_rabbit_fixture
     def test_messaging_getExchange(self):
         exchange_name = factory.getRandomString()
@@ -87,6 +89,7 @@
         self.assertEqual(messaging._session, exchange._session)
         self.assertEqual(exchange_name, exchange.exchange_name)
 
+    @skip("XXX bug=1225980: This breaks on the lander.")
     @uses_rabbit_fixture
     def test_messaging_getQueue(self):
         exchange_name = factory.getRandomString()