Merge lp:~rvb/maas/fix-power-query into lp:~maas-committers/maas/trunk
Proposed by
Raphaël Badin
Status: | Merged |
---|---|
Approved by: | Raphaël Badin |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3049 |
Proposed branch: | lp:~rvb/maas/fix-power-query |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
86 lines (+40/-4) 2 files modified
src/provisioningserver/rpc/clusterservice.py (+4/-4) src/provisioningserver/rpc/tests/test_clusterservice.py (+36/-0) |
To merge this branch: | bzr merge lp:~rvb/maas/fix-power-query |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | Approve | ||
Review via email: mp+235442@code.launchpad.net |
Commit message
Fix call to get_power_state() in cluster.
Description of the change
Looks like tests were not even written for this code. How this got in in the first place is anyone's guess.
To post a comment you must log in.
The attempt to merge lp:~rvb/maas/fix-power-query into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease security. ubuntu. com trusty-security Release.gpg [933 B] security. ubuntu. com trusty-security Release [59.7 kB] nova.clouds. archive. ubuntu. com trusty InRelease nova.clouds. archive. ubuntu. com trusty-updates InRelease nova.clouds. archive. ubuntu. com trusty Release.gpg nova.clouds. archive. ubuntu. com trusty-updates Release.gpg [933 B] nova.clouds. archive. ubuntu. com trusty Release nova.clouds. archive. ubuntu. com trusty-updates Release [59.7 kB] security. ubuntu. com trusty- security/ main Sources [44.3 kB] nova.clouds. archive. ubuntu. com trusty/main Sources security. ubuntu. com trusty- security/ universe Sources [10.8 kB] nova.clouds. archive. ubuntu. com trusty/universe Sources security. ubuntu. com trusty- security/ main amd64 Packages [140 kB] nova.clouds. archive. ubuntu. com trusty/main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe amd64 Packages nova.clouds. archive. ubuntu. com trusty/main Translation-en nova.clouds. archive. ubuntu. com trusty/universe Translation-en security. ubuntu. com trusty- security/ universe amd64 Packages [47.1 kB] security. ubuntu. com trusty- security/ main Translation-en security. ubuntu. com trusty- security/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Translation-en_US nova.clouds. archive. ubuntu. com trusty/universe Translation-en_US nova.clouds. archive. ubuntu. com trusty-updates/main Sources [120 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources [84.7 kB] nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [320 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [203 kB] nova.clouds. archive. ubuntu. com trusty-updates/main Translation-en nova.clouds. archive. ubuntu. com trusty- updates/ universe Translation-en 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 pytho...
Get:1 http://
Get:2 http://
Ign http://
Ign http://
Hit http://
Get:3 http://
Hit http://
Get:4 http://
Get:5 http://
Hit http://
Get:6 http://
Hit http://
Get:7 http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:8 http://
Hit http://
Hit http://
Ign http://
Ign http://
Get:9 http://
Get:10 http://
Get:11 http://
Get:12 http://
Hit http://
Hit http://
Fetched 1,090 kB in 0s (1,700 kB/s)
Reading package lists...
sudo DEBIAN_
--