MAAS

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

  1. disable-rabbit-tests
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 1610
Proposed branch: lp:~jtv/maas/disable-rabbit-tests
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 27 lines (+3/-0)
1 file modified
src/maasserver/tests/test_rabbit.py (+3/-0)
To merge this branch: bzr merge lp:~jtv/maas/disable-rabbit-tests
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+185780@code.launchpad.net

Commit message

Temporarily disable TestRabbitMessaging tests (as per bug 1225980).

Description of the change

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

Jeroen

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1515
16import socket16import socket
17import time17import time
18from unittest import skip
1819
19from amqplib import client_0_8 as amqp20from amqplib import client_0_8 as amqp
20from django.conf import settings21from django.conf import settings
@@ -78,6 +79,7 @@
7879
79class TestRabbitMessaging(MAASTestCase):80class TestRabbitMessaging(MAASTestCase):
8081
82 @skip("XXX bug=1225980: This breaks on the lander.")
81 @uses_rabbit_fixture83 @uses_rabbit_fixture
82 def test_messaging_getExchange(self):84 def test_messaging_getExchange(self):
83 exchange_name = factory.getRandomString()85 exchange_name = factory.getRandomString()
@@ -87,6 +89,7 @@
87 self.assertEqual(messaging._session, exchange._session)89 self.assertEqual(messaging._session, exchange._session)
88 self.assertEqual(exchange_name, exchange.exchange_name)90 self.assertEqual(exchange_name, exchange.exchange_name)
8991
92 @skip("XXX bug=1225980: This breaks on the lander.")
90 @uses_rabbit_fixture93 @uses_rabbit_fixture
91 def test_messaging_getQueue(self):94 def test_messaging_getQueue(self):
92 exchange_name = factory.getRandomString()95 exchange_name = factory.getRandomString()