Merge into trunk : rpc-test-failure--bug-1288001 : Code : MAAS

Status:

Merged

Approved by:

Gavin Panella on 2014-03-05

Approved revision:

no longer in the source branch.

Merged at revision:

2079

Proposed branch:

lp:~allenap/maas/rpc-test-failure--bug-1288001

Merge into:

lp:~maas-committers/maas/trunk

Diff against target:

38 lines (+3/-6)

2 files modified

src/maasserver/utils/tests/test_async.py (+3/-3)
src/maasserver/views/tests/test_rpc.py (+0/-3)

To merge this branch:

bzr merge lp:~allenap/maas/rpc-test-failure--bug-1288001

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)			Approve on 2014-03-05
Review via email: mp+209432@code.launchpad.net

Commit message

In the test suite, don't start the event-loop unless as a managed resource.

In other words, it can be started, but a clean-up needs to be arranged to stop it again, or its presence will interfere with other tests.

Revision history for this message

Gavin Panella (allenap) on 2014-03-05:

#

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-03-05:

#

Download full text (15.3 KiB)

The attempt to merge lp:~allenap/maas/rpc-test-failure--bug-1288001 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
Get:1 http://nova.clouds.archive.ubuntu.com trusty Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Get:2 http://nova.clouds.archive.ubuntu.com trusty Release [58.5 kB]
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
Get:3 http://nova.clouds.archive.ubuntu.com trusty/main Sources [1,062 kB]
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Get:4 http://nova.clouds.archive.ubuntu.com trusty/universe Sources [6,408 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages [1,346 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages [5,877 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty/main Translation-en [763 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en [4,051 kB]
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
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 19.6 MB in 7s (2,579 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oa...

The attempt to merge lp:~allenap/maas/rpc-test-failure--bug-1288001 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
Get:1 http://nova.clouds.archive.ubuntu.com trusty Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Get:2 http://nova.clouds.archive.ubuntu.com trusty Release [58.5 kB]
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
Get:3 http://nova.clouds.archive.ubuntu.com trusty/main Sources [1,062 kB]
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Get:4 http://nova.clouds.archive.ubuntu.com trusty/universe Sources [6,408 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages [1,346 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages [5,877 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty/main Translation-en [763 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en [4,051 kB]
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
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 19.6 MB in 7s (2,579 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip python-pocket-lint python-psycopg2 python-pyinotify python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-txtftp python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 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.
distro-info is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools 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.
libpq-dev is already the newest version.
make is already the newest version.
postgresql is already the newest version.
python-amqplib is already the newest version.
python-bzrlib is already the newest version.
python-celery is already the newest version.
python-convoy 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 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-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-lxml is already the newest version.
python-netaddr is already the newest version.
python-netifaces 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-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-tempita 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-yaml 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.
xvfb 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-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
The following packages were automatically installed and are no longer required:
  libgcrypt20 libpython3.4-minimal libpython3.4-stdlib python3.4
  python3.4-minimal
Use 'apt-get autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 251 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.ERL5EL/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.ERL5EL/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.ERL5EL
New python executable in /tmp/tarmac/branch.ERL5EL/bin/python2.7
Also creating executable in /tmp/tarmac/branch.ERL5EL/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.ERL5EL/parts'.
Creating directory '/tmp/tarmac/branch.ERL5EL/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.ERL5EL/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/test.pserv'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.ERL5EL/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.ERL5EL/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.ERL5EL/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/provisioningserver/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.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'...

..S....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................E.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
======================================================================
ERROR: maasserver.tests.test_forms.TestNetworkForm.test_macaddresses_are_sorted
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.ERL5EL/src/maasserver/tests/test_forms.py", line 1552, in test_macaddresses_are_sorted
    factory.make_mac_address(networks=[factory.make_network()])
  File "/tmp/tarmac/branch.ERL5EL/src/maasserver/testing/factory.py", line 622, in make_network
    network.save()
  File "/tmp/tarmac/branch.ERL5EL/src/maasserver/models/cleansave.py", line 37, in save
    self.full_clean()
  File "/usr/lib/python2.7/dist-packages/django/db/models/base.py", line 950, in full_clean
    raise ValidationError(errors)
ValidationError: {'vlan_tag': [u'Network with this Vlan tag already exists.']}

----------------------------------------------------------------------
Ran 2292 tests in 230.668s

FAILED (SKIP=2, errors=1)
..........................................................................................................
----------------------------------------------------------------------
Ran 106 tests in 1.213s

OK
........................................................S..S.....................................................................
----------------------------------------------------------------------
Ran 129 tests in 2.051s

OK (SKIP=2)
.........................................................................................................................................................................................................................................................................................................................................................................SSSS.........................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 790 tests in 37.194s

OK (SKIP=4)
make: *** [test] Error 123

1	=== modified file 'src/maasserver/utils/tests/test_async.py'
2	--- src/maasserver/utils/tests/test_async.py 2014-03-05 00:40:03 +0000
3	+++ src/maasserver/utils/tests/test_async.py 2014-03-05 12:05:03 +0000
4	@@ -17,7 +17,7 @@
5	from functools import partial
6	from time import time
7
8	-from maasserver import eventloop
9	+import crochet
10	from maasserver.utils import async
11	from maastesting.testcase import MAASTestCase
12	from mock import sentinel
13	@@ -33,8 +33,8 @@
14	from twisted.internet.task import deferLater
15	from twisted.python.failure import Failure
16
17	-
18	-eventloop.start()
19	+# These tests need a running reactor.
20	+crochet.setup()
21
22
23	class TestGather(MAASTestCase):
24
25	=== modified file 'src/maasserver/views/tests/test_rpc.py'
26	--- src/maasserver/views/tests/test_rpc.py 2014-03-05 01:26:35 +0000
27	+++ src/maasserver/views/tests/test_rpc.py 2014-03-05 12:05:03 +0000
28	@@ -41,10 +41,7 @@
29
30	class RPCViewTest(MAASServerTestCase):
31
32	- # XXX 2014-03-05 gmb bug=1288001:
33	- # This fails due to an apparent isolation problem.
34	def test_rpc_info(self):
35	- self.skip("Disabled due to a test isolation problem.")
36	response = self.client.get(reverse('rpc-info'))
37	self.assertEqual("application/json", response["Content-Type"])
38	info = json.loads(response.content)

MAAS

Merge lp:~allenap/maas/rpc-test-failure--bug-1288001 into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers