MAAS

Merge lp:~julian-edwards/maas/fix-power-error-message into lp:~maas-committers/maas/trunk

fix-power-error-message
Merge into trunk

Proposed by Julian Edwards on 2014-09-12

Status:

Merged

Approved by:

Julian Edwards on 2014-09-12

Approved revision:

no longer in the source branch.

Merged at revision:

2974

Proposed branch:

lp:~julian-edwards/maas/fix-power-error-message

Merge into:

lp:~maas-committers/maas/trunk

Diff against target:

30 lines (+5/-4)

2 files modified

src/maasserver/models/tests/test_node.py (+3/-3)
src/provisioningserver/power/poweraction.py (+2/-1)

To merge this branch:

bzr merge lp:~julian-edwards/maas/fix-power-error-message

Related bugs:

Bug #1357071: When a power template fails, the content of the event from the node event log is not readable (it contains the whole template)

High

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)		2014-09-12	Approve on 2014-09-12
Review via email: mp+234408@code.launchpad.net

Commit message

Prevent template text getting dumped in error messages for power action failures as it obscures the error output itself.

Revision history for this message

Jeroen T. Vermeulen (jtv) wrote on 2014-09-12:

#

I think this also fixes bug 1363823.

review: Approve

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-09-12:

#

So it does, thanks!

Revision history for this message

Gavin Panella (allenap) on 2014-09-12:

#

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-09-12:

#

On Friday 12 Sep 2014 09:47:40 you wrote:
> Note that err.output will be a byte string and so should be decoded here,
> probably with the 'replace' error strategy.

Right, thanks for pointing that out, it's so easy to forget :(

Revision history for this message

Gavin Panella (allenap) wrote on 2014-09-12:

#

> Right, thanks for pointing that out, it's so easy to forget :(

I wish there was a way to prevent implicit encoding/decoding of byte and unicode strings in Python 2 :-(

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-09-12:

#

Download full text (18.6 KiB)

The attempt to merge lp:~julian-edwards/maas/fix-power-error-message 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
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
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
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
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
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-pyinotify python-seamicroclient python-simplejson python-simplestreams python...

The attempt to merge lp:~julian-edwards/maas/fix-power-error-message 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
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
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
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
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
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-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txamqp python-txlongpoll python-txtftp python-tz python-virtualenv python-yaml python-zope.interface rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mimeparse is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-yaml is already the newest version.
python-zope.interface is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
xvfb is already the newest version.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 16 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 16 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.aNSrgu/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.aNSrgu/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.aNSrgu
New python executable in /tmp/tarmac/branch.aNSrgu/bin/python2.7
Also creating executable in /tmp/tarmac/branch.aNSrgu/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.aNSrgu/parts'.
Creating directory '/tmp/tarmac/branch.aNSrgu/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.aNSrgu/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.aNSrgu/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.aNSrgu/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.aNSrgu/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.457s

OK
..S.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................F................................................................................................................................................................................................................................................................................................................................................................................................................................................................S................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: maasserver.models.tests.test_node.NodeTest.test_mark_failed_raises_for_unauthorized_node_status
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.aNSrgu/src/maasserver/models/tests/test_node.py", line 1153, in test_mark_failed_raises_for_unauthorized_node_status
    self.assertRaises(NodeStateViolation, node.mark_failed, description)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 393, in assertRaises
    self.assertThat(our_callable, matcher)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: <bound method Node.mark_failed of <Node: node-8cd6f8c2-3a66-11e4-be95-fa163ee59350 (Bu5uL9IjMup2lnr2l5lk)>> returned None

----------------------------------------------------------------------
Ran 3340 tests in 319.274s

FAILED (SKIP=2, failures=1)
..............................................................................................................................
----------------------------------------------------------------------
Ran 126 tests in 2.108s

OK
..............................................................S........................................................................................
----------------------------------------------------------------------
Ran 151 tests in 28.185s

OK (SKIP=1)
.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1497 tests in 17.388s

OK
make: *** [test] Error 123

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andres Rodriguez

Blake Rouse

Brendan Donegan

Dave Walker

Deepa

Enrique Chirivella Pérez

Fumihito YOSHIDA

Julian Edwards

MAAS Committers

Mike Pontillo

james beedy