Merge lp:~allenap/maas/region-leaky-tests into lp:~maas-committers/maas/trunk

[Gavin Panella]

Fix many leaky tests, re-enable regionservice tests, and make MAASCrochetRunTest the default when appropriate.

[Gavin Panella (allenap)]

With the exception of the following, this changes only tests:

--- src/maasserver/rack_controller.py   2016-05-11 19:01:48 +0000
+++ src/maasserver/rack_controller.py   2016-05-13 16:12:12 +0000
@@ -205,7 +205,10 @@

     def process(self):
         """Process the next rack controller that needs an update."""
-        if len(self.needsDHCPUpdate) == 0:
+        if not self.running:
+            # We're shutting down.
+            self.processing.stop()
+        elif len(self.needsDHCPUpdate) == 0:
             # Nothing more to do.
             self.processing.stop()
         else:

[LaMont Jones (lamont)]

Looks reasonable.

review: Approve

[Jeffrey C Jones (trapnine)]

Lgtm. Glad we're fixing these.

review: Approve

=== modified file 'src/maasserver/api/tests/test_boot_resources.py'
--- src/maasserver/api/tests/test_boot_resources.py	2016-02-26 18:48:26 +0000
+++ src/maasserver/api/tests/test_boot_resources.py	2016-05-16 09:22:35 +0000
@@ -14,6 +14,7 @@
     boot_resource_set_to_dict,
     boot_resource_to_dict,
 )
+from maasserver.clusterrpc.boot_images import RackControllersImporter
 from maasserver.enum import (
     BOOT_RESOURCE_FILE_TYPE,
     BOOT_RESOURCE_TYPE,
@@ -113,6 +114,11 @@
             dict_representation['sets'][resource_set.version])
 
 
+def prevent_scheduling_of_image_imports(test):
+    """Make `RackControllersImporter.schedule` a no-op."""
+    test.patch_autospec(RackControllersImporter, "schedule")
+
+
 class TestBootResourcesAPI(APITestCase):
     """Test the the boot resource API."""
 
@@ -211,6 +217,7 @@
         return upload_type, filetype
 
     def test_POST_creates_boot_resource(self):
+        prevent_scheduling_of_image_imports(self)
         self.become_admin()
 
         name = factory.make_name('name')
@@ -241,6 +248,7 @@
         self.assertEqual(sample_binary_data, written_data)
 
     def test_POST_creates_boot_resource_with_default_filetype(self):
+        prevent_scheduling_of_image_imports(self)
         self.become_admin()
 
         name = factory.make_name('name')
@@ -330,6 +338,7 @@
         self.assertEqual(http.client.BAD_REQUEST, response.status_code)
 
     def test_POST_returns_full_definition_of_boot_resource(self):
+        prevent_scheduling_of_image_imports(self)
         self.become_admin()
 
         name = factory.make_name('name')
@@ -464,6 +473,7 @@
             reverse('boot_resource_file_upload_handler', args=['3', '5']))
 
     def test_PUT_resource_file_writes_content(self):
+        prevent_scheduling_of_image_imports(self)
         self.become_admin()
         rfile, content = self.make_empty_resource_file()
         response = self.client.put(
@@ -541,6 +551,7 @@
             MockCalledOnceWith())
 
     def test_PUT_with_multiple_requests_and_large_content(self):
+        prevent_scheduling_of_image_imports(self)
         self.become_admin()
 
         # Get large amount of data to test with

=== modified file 'src/maasserver/api/tests/test_machine.py'
--- src/maasserver/api/tests/test_machine.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/api/tests/test_machine.py	2016-05-16 09:22:35 +0000
@@ -36,6 +36,7 @@
     StaticIPAddress,
 )
 from maasserver.models.node import RELEASABLE_STATUSES
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.storage_layouts import (
     MIN_BOOT_PARTITION_SIZE,
     StorageLayoutError,
@@ -1382,8 +1383,9 @@
         machine_stop = self.patch(node_module.Machine, "_stop")
         machine_stop.side_effect = lambda user: post_commit()
 
-        response = self.client.post(
-            self.get_machine_uri(machine), {'op': 'abort'})
+        with SignalsDisabled("power"):
+            response = self.client.post(
+                self.get_machine_uri(machine), {'op': 'abort'})
 
         self.assertEqual(http.client.OK, response.status_code)
         self.assertEqual(

=== modified file 'src/maasserver/api/tests/test_tag.py'
--- src/maasserver/api/tests/test_tag.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/api/tests/test_tag.py	2016-05-16 09:22:35 +0000
@@ -503,6 +503,7 @@
         self.assertFalse(Tag.objects.filter(name=name).exists())
 
     def test_POST_new_creates_tag(self):
+        self.patch_autospec(Tag, "populate_nodes")
         self.become_admin()
         name = factory.make_string()
         definition = '//node'
@@ -521,6 +522,7 @@
         self.assertEqual(comment, parsed_result['comment'])
         self.assertEqual(definition, parsed_result['definition'])
         self.assertTrue(Tag.objects.filter(name=name).exists())
+        self.assertThat(Tag.populate_nodes, MockCalledOnceWith(ANY))
 
     def test_POST_new_without_definition_creates_tag(self):
         self.become_admin()
@@ -562,6 +564,7 @@
         self.assertFalse(Tag.objects.filter(name=invalid).exists())
 
     def test_POST_new_kernel_opts(self):
+        self.patch_autospec(Tag, "populate_nodes")
         self.become_admin()
         name = factory.make_string()
         definition = '//node'
@@ -584,6 +587,7 @@
         self.assertEqual(extra_kernel_opts, parsed_result['kernel_opts'])
         self.assertEqual(
             extra_kernel_opts, Tag.objects.filter(name=name)[0].kernel_opts)
+        self.assertThat(Tag.populate_nodes, MockCalledOnceWith(ANY))
 
     def test_POST_new_populates_nodes(self):
         populate_nodes = self.patch_autospec(Tag, "populate_nodes")

=== added file 'src/maasserver/models/signals/testing.py'
--- src/maasserver/models/signals/testing.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/models/signals/testing.py	2016-05-16 09:22:35 +0000
@@ -0,0 +1,48 @@
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Testing helpers for dealing with signals."""
+
+__all__ = [
+    "SignalsDisabled",
+]
+
+from fixtures import Fixture
+from maasserver.models import signals
+
+
+class SignalsDisabled(Fixture):
+    """Disable all signals managed by `SignalsManager`.
+
+    By convention, modules imported into `maasserver.models.signals` ought to
+    have a ``signals`` attribute which is an instance of `SignalsManager`.
+    """
+
+    managers = {
+        name: getattr(signals, name).signals
+        for name in signals.__all__
+    }
+
+    def __init__(self, *disable):
+        """Initialise a new `SignalsDisabled` fixture.
+
+        :param disable: The signal managers to disable. Can be specified as
+            names of managers or as `SignalsManager` instances. If no managers
+            are specified, ALL managers will be disabled. If the manager is
+            already disabled it will not be enabled at clean-up.
+        """
+        super(SignalsDisabled, self).__init__()
+        if len(disable) == 0:
+            self.disable = self.managers.values()
+        else:
+            self.disable = {
+                self.managers[d] if isinstance(d, str) else d
+                for d in disable
+            }
+
+    def setUp(self):
+        super(SignalsDisabled, self).setUp()
+        for manager in self.disable:
+            if manager.enabled:
+                self.addCleanup(manager.enable)
+                manager.disable()

=== modified file 'src/maasserver/models/signals/tests/test_power.py'
--- src/maasserver/models/signals/tests/test_power.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/models/signals/tests/test_power.py	2016-05-16 09:22:35 +0000
@@ -45,12 +45,15 @@
         old_status = NODE_STATUS.COMMISSIONING
         node = factory.make_Node(status=old_status, power_type='virsh')
         node.status = get_failed_status(old_status)
-        node.save()
-        # update_power_state_of_node_soon is registered as a post-commit task,
-        # so it's not called immediately.
-        self.expectThat(
-            power.update_power_state_of_node_soon,
-            MockNotCalled())
+
+        with post_commit_hooks:
+            node.save()
+            # update_power_state_of_node_soon is registered as a post-commit
+            # task, so it's not called immediately.
+            self.expectThat(
+                power.update_power_state_of_node_soon,
+                MockNotCalled())
+
         # One post-commit hooks have been fired, then it's called.
         post_commit_hooks.fire()
         self.assertThat(

=== modified file 'src/maasserver/rack_controller.py'
--- src/maasserver/rack_controller.py	2016-05-11 19:01:48 +0000
+++ src/maasserver/rack_controller.py	2016-05-16 09:22:35 +0000
@@ -205,7 +205,10 @@
 
     def process(self):
         """Process the next rack controller that needs an update."""
-        if len(self.needsDHCPUpdate) == 0:
+        if not self.running:
+            # We're shutting down.
+            self.processing.stop()
+        elif len(self.needsDHCPUpdate) == 0:
             # Nothing more to do.
             self.processing.stop()
         else:

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2016-05-13 21:51:16 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2016-05-16 09:22:35 +0000
@@ -58,6 +58,7 @@
     timestampedmodel,
 )
 from maasserver.models.interface import PhysicalInterface
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.models.timestampedmodel import now
 from maasserver.rpc import (
     events as events_module,
@@ -198,24 +199,6 @@
 wait_for_reactor = wait_for(30)  # 30 seconds.
 
 
-class SkipAll:
-
-    skipReason = "XXX: GavinPanella 2016-04-12 bug=1572646: Fails spuriously."
-
-    def setUp(self):
-        super(SkipAll, self).setUp()
-        self.skipTest(self.skipReason)
-
-    @classmethod
-    def make(cls, base):
-        return type(base.__name__, (cls, base), {})
-
-
-MAASTestCase = SkipAll.make(MAASTestCase)
-MAASServerTestCase = SkipAll.make(MAASServerTestCase)
-MAASTransactionServerTestCase = SkipAll.make(MAASTransactionServerTestCase)
-
-
 @transactional
 def transactional_reload_object(obj):
     return reload_object(obj)
@@ -517,6 +500,7 @@
              "ports": urlparse("http://ports.ubuntu.com/ubuntu-ports")},
             response)
 
+    @wait_for_reactor
     @inlineCallbacks
     def test_get_archive_mirrors_with_ports_archive_set(self):
         url = factory.make_parsed_url()
@@ -525,7 +509,7 @@
         response = yield call_responder(Region(), GetArchiveMirrors, {})
 
         self.assertEqual(
-            {"main": urlparse("http://arhive.ubuntu.com/ubuntu"),
+            {"main": urlparse("http://archive.ubuntu.com/ubuntu"),
              "ports": url},
             response)
 
@@ -590,6 +574,7 @@
     @wait_for_reactor
     @inlineCallbacks
     def test_mark_node_failed_changes_status_and_updates_error_msg(self):
+        self.useFixture(SignalsDisabled("power"))
         system_id = yield deferToDatabase(self.create_deploying_node)
 
         error_description = factory.make_name('error-description')

=== modified file 'src/maasserver/tests/test_bootresources.py'
--- src/maasserver/tests/test_bootresources.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/tests/test_bootresources.py	2016-05-16 09:22:35 +0000
@@ -59,6 +59,7 @@
     Config,
     LargeFile,
 )
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.rpc.testing.fixtures import MockLiveRegionToClusterRPCFixture
 from maasserver.testing.config import RegionConfigurationFixture
 from maasserver.testing.dblocks import lock_held_in_other_thread
@@ -723,6 +724,7 @@
             mock_prevent, MockNotCalled())
 
     def test_get_or_create_boot_resource_set_creates_resource_set(self):
+        self.useFixture(SignalsDisabled("largefiles"))
         name, architecture, product = make_product()
         product, resource = make_boot_resource_group_from_product(product)
         with post_commit_hooks:
@@ -742,6 +744,7 @@
         self.assertEqual(product['label'], resource_set.label)
 
     def test_get_or_create_boot_resource_file_creates_resource_file(self):
+        self.useFixture(SignalsDisabled("largefiles"))
         name, architecture, product = make_product()
         product, resource = make_boot_resource_group_from_product(product)
         resource_set = resource.sets.first()
@@ -888,6 +891,7 @@
         self.assertThat(mock_save_later, MockNotCalled())
 
     def test_insert_deletes_mismatch_largefile(self):
+        self.useFixture(SignalsDisabled("largefiles"))
         name, architecture, product = make_product()
         with transaction.atomic():
             product, resource = make_boot_resource_group_from_product(product)
@@ -905,6 +909,7 @@
         self.assertThat(mock_save_later, MockNotCalled())
 
     def test_insert_prints_warning_if_mismatch_largefile(self):
+        self.useFixture(SignalsDisabled("largefiles"))
         name, architecture, product = make_product()
         with transaction.atomic():
             product, resource = make_boot_resource_group_from_product(product)
@@ -986,6 +991,7 @@
         # Test case for bug 1419041: if the call to insert() makes
         # an existing complete resource incomplete: print an error in the
         # log.
+        self.useFixture(SignalsDisabled("largefiles"))
         name, architecture, product = make_product()
         with transaction.atomic():
             resource = factory.make_BootResource(
@@ -1057,6 +1063,7 @@
             BootResourceSet.objects.filter(id=incomplete_set.id).exists())
 
     def test_resource_set_cleaner_keeps_only_newest_completed_set(self):
+        self.useFixture(SignalsDisabled("largefiles"))
         with transaction.atomic():
             resource = factory.make_BootResource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED)

=== modified file 'src/maasserver/tests/test_node_action.py'
--- src/maasserver/tests/test_node_action.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/tests/test_node_action.py	2016-05-16 09:22:35 +0000
@@ -25,6 +25,7 @@
     signals,
     StaticIPAddress,
 )
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.node_action import (
     Abort,
     Acquire,
@@ -297,6 +298,7 @@
 class TestAbortAction(MAASTransactionServerTestCase):
 
     def test_Abort_aborts_disk_erasing(self):
+        self.useFixture(SignalsDisabled("power"))
         with transaction.atomic():
             owner = factory.make_User()
             node = factory.make_Node(

=== modified file 'src/maasserver/tests/test_rack_controller.py'
--- src/maasserver/tests/test_rack_controller.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/tests/test_rack_controller.py	2016-05-16 09:22:35 +0000
@@ -312,7 +312,7 @@
         service.running = False
         mock_processDHCP = self.patch(service, "processDHCP")
         service.startProcessing()
-        yield service.processing
+        yield service.processingDone
         self.assertThat(mock_processDHCP, MockNotCalled())
 
     @wait_for_reactor

=== modified file 'src/maasserver/tests/test_region_controller.py'
--- src/maasserver/tests/test_region_controller.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/tests/test_region_controller.py	2016-05-16 09:22:35 +0000
@@ -46,28 +46,37 @@
                 needsDNSUpdate=False,
                 postgresListener=sentinel.listener))
 
+    @wait_for_reactor
+    @inlineCallbacks
     def test_startService_registers_with_postgres_listener(self):
         listener = MagicMock()
         service = RegionControllerService(listener)
         service.startService()
+        yield service.processingDefer
         self.assertThat(
             listener.register,
             MockCallsMatch(
                 call("sys_dns", service.markDNSForUpdate),
                 call("sys_proxy", service.markProxyForUpdate)))
 
+    @wait_for_reactor
+    @inlineCallbacks
     def test_startService_calls_markDNSForUpdate(self):
         listener = MagicMock()
         service = RegionControllerService(listener)
         mock_markDNSForUpdate = self.patch(service, "markDNSForUpdate")
         service.startService()
+        yield service.processingDefer
         self.assertThat(mock_markDNSForUpdate, MockCalledOnceWith(None, None))
 
+    @wait_for_reactor
+    @inlineCallbacks
     def test_startService_calls_markProxyForUpdate(self):
         listener = MagicMock()
         service = RegionControllerService(listener)
         mock_markProxyForUpdate = self.patch(service, "markProxyForUpdate")
         service.startService()
+        yield service.processingDefer
         self.assertThat(
             mock_markProxyForUpdate, MockCalledOnceWith(None, None))
 

=== modified file 'src/maasserver/tests/test_status_monitor.py'
--- src/maasserver/tests/test_status_monitor.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/tests/test_status_monitor.py	2016-05-16 09:22:35 +0000
@@ -13,13 +13,13 @@
 from unittest.mock import call
 
 from maasserver import status_monitor
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.node_status import NODE_FAILURE_STATUS_TRANSITIONS
 from maasserver.status_monitor import (
     mark_nodes_failed_after_expiring,
     StatusMonitorService,
 )
 from maasserver.testing.factory import factory
-from maasserver.testing.orm import post_commit_hooks
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.orm import reload_object
 from maastesting.matchers import (
@@ -34,6 +34,7 @@
 class TestMarkNodesFailedAfterExpiring(MAASServerTestCase):
 
     def test__marks_all_possible_failed_status_as_failed(self):
+        self.useFixture(SignalsDisabled("power"))
         current_time = datetime.now()
         self.patch(status_monitor, "now").return_value = current_time
         expired_time = current_time - timedelta(minutes=1)
@@ -41,8 +42,7 @@
             factory.make_Node(status=status, status_expires=expired_time)
             for status in NODE_FAILURE_STATUS_TRANSITIONS.keys()
         ]
-        with post_commit_hooks:
-            mark_nodes_failed_after_expiring()
+        mark_nodes_failed_after_expiring()
         failed_statuses = [
             reload_object(node).status
             for node in nodes
@@ -51,6 +51,7 @@
             NODE_FAILURE_STATUS_TRANSITIONS.values(), failed_statuses)
 
     def test__skips_those_that_have_not_expired(self):
+        self.useFixture(SignalsDisabled("power"))
         current_time = datetime.now()
         self.patch(status_monitor, "now").return_value = current_time
         expired_time = current_time + timedelta(minutes=1)
@@ -58,8 +59,7 @@
             factory.make_Node(status=status, status_expires=expired_time)
             for status in NODE_FAILURE_STATUS_TRANSITIONS.keys()
         ]
-        with post_commit_hooks:
-            mark_nodes_failed_after_expiring()
+        mark_nodes_failed_after_expiring()
         failed_statuses = [
             reload_object(node).status
             for node in nodes

=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2016-05-16 09:22:35 +0000
@@ -16,14 +16,13 @@
 )
 from maasserver.models import (
     BootResource,
-    BootSourceCache,
     Config,
 )
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.testing.factory import factory
 from maasserver.testing.osystems import make_usable_osystem
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils import osystems as osystems_module
-from maasserver.utils.orm import post_commit_hooks
 from maasserver.utils.osystems import (
     get_distro_series_initial,
     get_release_requires_key,
@@ -260,17 +259,11 @@
         self.assertEqual(choices, list_commissioning_choices([osystem]))
 
     def test_make_hwe_kernel_ui_text_finds_release_from_bootsourcecache(self):
+        self.useFixture(SignalsDisabled("bootsources"))
         release = factory.pick_ubuntu_release()
         kernel = 'hwe-' + release[0]
-        # Stub out the post commit tasks otherwise the test fails due to
-        # unrun post-commit tasks at the end of the test.
-        self.patch(BootSourceCache, "post_commit_do")
-        # Force run the post commit tasks as we make new boot sources
-        with post_commit_hooks:
-            factory.make_BootSourceCache(
-                os="ubuntu/%s" % release,
-                subarch=kernel,
-                release=release)
+        factory.make_BootSourceCache(
+            os="ubuntu/%s" % release, subarch=kernel, release=release)
         self.assertEqual(
             '%s (%s)' % (release, kernel),
             make_hwe_kernel_ui_text(kernel))

=== modified file 'src/maastesting/testcase.py'
--- src/maastesting/testcase.py	2016-05-12 19:07:37 +0000
+++ src/maastesting/testcase.py	2016-05-16 09:22:35 +0000
@@ -16,11 +16,13 @@
 import os
 from unittest import mock
 
+import crochet
 from maastesting.crochet import EventualResultCatchingMixin
 from maastesting.factory import factory
 from maastesting.fixtures import TempDirectory
 from maastesting.matchers import DocTestMatches
 from maastesting.runtest import (
+    MAASCrochetRunTest,
     MAASRunTest,
     MAASTwistedRunTest,
 )
@@ -100,9 +102,6 @@
 
     """
 
-    # Use a customised executor.
-    run_tests_with = MAASRunTest
-
     # Allow testtools to generate longer diffs when tests fail.
     maxDiff = testtools.TestCase.maxDiff * 3
 
@@ -126,6 +125,18 @@
     database_use_possible = "DJANGO_SETTINGS_MODULE" in os.environ
     database_use_permitted = False
 
+    @property
+    def run_tests_with(self):
+        """Use a customised executor.
+
+        If crochet is managing the Twisted reactor, use `MAASCrochetRunTest`,
+        otherwise default to `MAASRunTest`.
+        """
+        if crochet._watchdog.is_alive():
+            return MAASCrochetRunTest
+        else:
+            return MAASRunTest
+
     def setUp(self):
         self.maybeCloseDatabaseConnections()
         super(MAASTestCase, self).setUp()

=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2016-05-12 19:07:37 +0000
+++ src/metadataserver/tests/test_api.py	2016-05-16 09:22:35 +0000
@@ -39,6 +39,7 @@
     Tag,
 )
 from maasserver.models.node import Node
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.rpc.testing.mixins import PreseedRPCMixin
 from maasserver.testing.config import RegionConfigurationFixture
 from maasserver.testing.factory import factory
@@ -500,6 +501,10 @@
 class TestMetadataUserDataStateChanges(MAASServerTestCase):
     """Tests for the metadata user-data API endpoint."""
 
+    def setUp(self):
+        super(TestMetadataUserDataStateChanges, self).setUp()
+        self.useFixture(SignalsDisabled("power"))
+
     def test_request_does_not_cause_status_change_if_not_deploying(self):
         status = factory.pick_enum(
             NODE_STATUS, but_not=[NODE_STATUS.DEPLOYING])
@@ -545,6 +550,10 @@
 
 class TestInstallingAPI(MAASServerTestCase):
 
+    def setUp(self):
+        super(TestInstallingAPI, self).setUp()
+        self.useFixture(SignalsDisabled("power"))
+
     def test_other_user_than_node_cannot_signal_installation_result(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYING)
         client = OAuthAuthenticatedClient(factory.make_User())
@@ -617,6 +626,10 @@
 
 class TestCommissioningAPI(MAASServerTestCase):
 
+    def setUp(self):
+        super(TestCommissioningAPI, self).setUp()
+        self.useFixture(SignalsDisabled("power"))
+
     def test_commissioning_scripts(self):
         script = factory.make_CommissioningScript()
         response = make_node_client().get(
@@ -841,6 +854,7 @@
         self.assertEqual('', reload_object(node).error)
 
     def test_signalling_stores_files_for_any_status(self):
+        self.useFixture(SignalsDisabled("power"))
         statuses = ['WORKING', 'OK', 'FAILED']
         filename = factory.make_string()
         nodes = {
@@ -962,8 +976,10 @@
             power_address=factory.make_ipv4_address(),
             power_user=factory.make_string(),
             power_pass=factory.make_string())
-        response = call_signal(
-            client, power_type="moonshot", power_parameters=json.dumps(params))
+        with SignalsDisabled("power"):
+            response = call_signal(
+                client, power_type="moonshot",
+                power_parameters=json.dumps(params))
         self.assertEqual(
             http.client.OK, response.status_code, response.content)
         node = reload_object(node)
@@ -1065,6 +1081,7 @@
             MockNotCalled())
 
     def test_signal_calls_sets_initial_network_config_if_OK(self):
+        self.useFixture(SignalsDisabled("power"))
         mock_set_initial_networking_configuration = self.patch_autospec(
             Node, "set_initial_networking_configuration")
         node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
@@ -1112,6 +1129,10 @@
 
 class TestDiskErasingAPI(MAASServerTestCase):
 
+    def setUp(self):
+        super(TestDiskErasingAPI, self).setUp()
+        self.useFixture(SignalsDisabled("power"))
+
     def test_signaling_erasing_failure_makes_node_failed_erasing(self):
         node = factory.make_Node(
             status=NODE_STATUS.DISK_ERASING, owner=factory.make_User())

=== modified file 'src/metadataserver/tests/test_api_status.py'
--- src/metadataserver/tests/test_api_status.py	2016-05-12 19:07:37 +0000
+++ src/metadataserver/tests/test_api_status.py	2016-05-16 09:22:35 +0000
@@ -20,6 +20,7 @@
     Event,
     Tag,
 )
+from maasserver.models.signals.testing import SignalsDisabled
 from maasserver.testing.factory import factory
 from maasserver.testing.oauthclient import OAuthAuthenticatedClient
 from maasserver.testing.testcase import MAASServerTestCase
@@ -66,6 +67,10 @@
 
 class TestStatusAPI(MAASServerTestCase):
 
+    def setUp(self):
+        super(TestStatusAPI, self).setUp()
+        self.useFixture(SignalsDisabled("power"))
+
     def test_other_user_than_node_cannot_signal_installation_result(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYING)
         client = OAuthAuthenticatedClient(factory.make_User())