Merge lp:~jtv/maas/spurious-curtin-preseed-failure into lp:~maas-committers/maas/trunk

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3209
Proposed branch: lp:~jtv/maas/spurious-curtin-preseed-failure
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 33 lines (+3/-7)
1 file modified
src/maasserver/tests/test_networking_preseed.py (+3/-7)
To merge this branch: bzr merge lp:~jtv/maas/spurious-curtin-preseed-failure
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Blake Rouse (community) Approve
Graham Binns (community) Approve
Review via email: mp+237550@code.launchpad.net

Commit message

Fix spurious test failure for generation of Curtin networking preseeds: Node.disable_ipv4 is randomised, and if it's True, the test breaks.

Description of the change

Amazing that there hasn't been an uproar about this yet. I guess it happened in release mode, and we just haven't been landing a lot of branches.

Jeroen

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve
Revision history for this message
Blake Rouse (blake-rouse) wrote :

There is a bug for this I just created, and I disabled this test to get it to land. So you need to merge trunk to remove the skip.

review: Needs Fixing
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Blake: I merged trunk and removed the skip. Thanks for pointing that out. I'll assume in this case that by Needs Fixing you actually meant Approved with notes.

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (19.1 KiB)

The attempt to merge lp:~jtv/maas/spurious-curtin-preseed-failure into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty 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-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://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/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
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [126 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [86.7 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [338 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [210 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
Fetched 821 kB in 3s (259 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 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-pocket-lint ...

Revision history for this message
Blake Rouse (blake-rouse) :
review: Approve
Revision history for this message
Raphaël Badin (rvb) wrote :

Approving this as it's a fix to a test and thus doesn't go into the package.

review: Approve
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Ironic! Held up by an entirely unrelated spurious test failure.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/tests/test_networking_preseed.py'
2--- src/maasserver/tests/test_networking_preseed.py 2014-10-08 07:32:34 +0000
3+++ src/maasserver/tests/test_networking_preseed.py 2014-10-08 08:51:37 +0000
4@@ -17,7 +17,6 @@
5
6 import json
7 from random import randint
8-from unittest import skip
9
10 from maasserver import networking_preseed
11 from maasserver.dns import zonegenerator
12@@ -762,18 +761,15 @@
13
14 class TestComposeCurtinNetworkPreseedFor(MAASServerTestCase):
15
16- @skip(
17- "XXX: blake_r 2014-10-08 bug=1378643: Periodic test failure due to "
18- "nameservers returning empty list.")
19 def test__composes_config(self):
20 fake = self.patch_autospec(
21 networking_preseed, 'compose_curtin_network_preseed')
22 fake.return_value = []
23- node = factory.make_Node()
24+ node = factory.make_Node(disable_ipv4=False)
25 node.nodegroup.accept()
26- network = factory.make_ipv4_network(slash=24)
27+ network = factory.make_ipv4_network(slash=16)
28 router = factory.pick_ip_in_network(network)
29- dns = factory.pick_ip_in_network(network)
30+ dns = factory.make_ipv4_address()
31 patch_dns_servers(self, dns)
32 static_low = unicode(IPAddress(network.first + 1))
33 static_high = unicode(IPAddress(network.first + 2))