Merge lp://staging/~julian-edwards/maas/releasing-timeout-bug-1390144 into lp://staging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Julian Edwards | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3359 | ||||
Proposed branch: | lp://staging/~julian-edwards/maas/releasing-timeout-bug-1390144 | ||||
Merge into: | lp://staging/~maas-committers/maas/trunk | ||||
Diff against target: |
182 lines (+42/-0) 4 files modified
src/maasserver/api/tests/test_node.py (+4/-0) src/maasserver/models/node.py (+9/-0) src/maasserver/models/tests/test_node.py (+27/-0) src/maasserver/tests/test_node_action.py (+2/-0) |
||||
To merge this branch: | bzr merge lp://staging/~julian-edwards/maas/releasing-timeout-bug-1390144 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | Approve | ||
Review via email: mp+241231@code.staging.launchpad.net |
Commit message
Use the transition monitor to put a timeout on RELEASING.
Description of the change
There's a lot of collateral test damage fixed here, as was the case with the similar change at r3332. I am deliberately not adding more of the *_CONNECT stuff because I want us to discuss in more detail a coherent testing strategy for anything involving cluster comms, because it's just too easy to lose test isolation as things stand.
To post a comment you must log in.
The attempt to merge lp:~julian-edwards/maas/releasing-timeout-bug-1390144 into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease nova.clouds. archive. ubuntu. com trusty InRelease security. ubuntu. com trusty-security Release.gpg nova.clouds. archive. ubuntu. com trusty-updates InRelease security. ubuntu. com trusty-security Release 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 [62.0 kB] security. ubuntu. com trusty- security/ main Sources security. ubuntu. com trusty- security/ universe Sources nova.clouds. archive. ubuntu. com trusty/main Sources security. ubuntu. com trusty- security/ main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe Sources security. ubuntu. com trusty- security/ universe amd64 Packages nova.clouds. archive. ubuntu. com trusty/main amd64 Packages security. ubuntu. com trusty- security/ main Translation-en nova.clouds. archive. ubuntu. com trusty/universe amd64 Packages security. ubuntu. com trusty- security/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Translation-en nova.clouds. archive. ubuntu. com trusty/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 [136 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources [89.3 kB] nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [356 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [217 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 gjs 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-poc...
Ign http://
Hit http://
Ign http://
Hit http://
Hit http://
Get:1 http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Get:3 http://
Get:4 http://
Get:5 http://
Get:6 http://
Hit http://
Hit http://
Fetched 861 kB in 2s (307 kB/s)
Reading package lists...
sudo DEBIAN_
--