Merge lp:~gmb/maas/fix-bubble into lp:~maas-committers/maas/trunk

[Graham Binns]

Ensure that PowerActionAlreadyAvailable bubbles up properly from pserv rather than being dropped.

[Gavin Panella (allenap)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~gmb/maas/fix-bubble into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [121 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [85.1 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [324 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [205 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 796 kB in 0s (1,493 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-...

[Julian Edwards (julian-edwards)]

On Monday 29 Sep 2014 15:50:25 you wrote:
> > + def check(failure):
> > + failure.trap(exceptions.PowerActionAlreadyInProgress)
> > + return d.addErrback(check)
>
> This is fine, but assert_fails_with() is better

Especially when there's no errback and the test passes :)

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2014-09-27 13:03:54 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2014-09-29 16:19:16 +0000
@@ -203,19 +203,21 @@
     @cluster.PowerOn.responder
     def power_on(self, system_id, hostname, power_type, context):
         """Turn a node on."""
-        maybe_change_power_state(
+        d = maybe_change_power_state(
             system_id, hostname, power_type, power_change='on',
             context=context)
-        return {}
+        d.addCallback(lambda _: {})
+        return d
 
     @log_call(level=logging.DEBUG)
     @cluster.PowerOff.responder
     def power_off(self, system_id, hostname, power_type, context):
         """Turn a node off."""
-        maybe_change_power_state(
+        d = maybe_change_power_state(
             system_id, hostname, power_type, power_change='off',
             context=context)
-        return {}
+        d.addCallback(lambda _: {})
+        return d
 
     @cluster.PowerQuery.responder
     def power_query(self, system_id, hostname, power_type, context):

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-27 16:12:10 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-29 16:19:16 +0000
@@ -93,7 +93,6 @@
     )
 from provisioningserver.testing.config import set_tftp_root
 from testtools import ExpectedException
-from testtools.deferredruntest import extract_result
 from testtools.matchers import (
     Contains,
     Equals,
@@ -1144,8 +1143,13 @@
             "system_id": "id", "hostname": "hostname", "power_type": "type",
             "context": {},
         })
-        self.assertRaises(
-            exceptions.PowerActionAlreadyInProgress, extract_result, d)
+        # If the call doesn't fail then we have a test failure; we're
+        # *expecting* PowerActionFail to be raised.
+        d.addCallback(self.fail)
+
+        def check(failure):
+            failure.trap(exceptions.PowerActionAlreadyInProgress)
+        return d.addErrback(check)
 
 
 class TestClusterProtocol_PowerQuery(MAASTestCase):