Merge lp:~blake-rouse/maas/fix-1511690 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix the assignment of the subnet on the static IP address migration. Fix the random tests failures from the last branch I landed.

[Blake Rouse (blake-rouse)]

Self-approving, minor fix.

review: Approve

=== modified file 'src/maasserver/migrations/0187_link_missing_subnets.py'
--- src/maasserver/migrations/0187_link_missing_subnets.py	2015-11-02 16:34:49 +0000
+++ src/maasserver/migrations/0187_link_missing_subnets.py	2015-11-02 20:32:03 +0000
@@ -14,8 +14,9 @@
         assert hasattr(Subnet.objects, "get_best_subnet_for_ip")
         for sip in orm['maasserver.StaticIPAddress'].objects.all():
             if sip.ip is not None and sip.ip != "" and sip.subnet is None:
-                sip.subnet = Subnet.objects.get_best_subnet_for_ip(sip.ip)
-                if sip.subnet != None:
+                subnet = Subnet.objects.get_best_subnet_for_ip(sip.ip)
+                if subnet != None:
+                    sip.subnet_id = subnet.id
                     sip.save()
 
     def backwards(self, orm):
 
=== modified file 'src/maasserver/models/tests/test_fannetwork.py'
--- src/maasserver/models/tests/test_fannetwork.py	2015-09-21 20:29:36 +0000
+++ src/maasserver/models/tests/test_fannetwork.py	2015-11-02 20:32:03 +0000
@@ -107,7 +107,7 @@
                 underlay="10.0.0.0/8", overlay="10.0.1.0/24")
 
     def test_stores_host_reserve(self):
-        host_reserve = random.randint(0, 200)
+        host_reserve = random.randint(1, 200)
         fannetwork = factory.make_FanNetwork(
             underlay=factory.make_ipv4_network(slash=16),
             overlay=factory.make_ipv4_network(slash=8),
 
=== modified file 'src/maasserver/websockets/tests/test_listener.py'
--- src/maasserver/websockets/tests/test_listener.py	2015-10-30 11:03:18 +0000
+++ src/maasserver/websockets/tests/test_listener.py	2015-11-02 20:32:03 +0000
@@ -17,7 +17,6 @@
 from collections import namedtuple
 import errno
 import random
-from unittest import skip
 
 from crochet import wait_for_reactor
 from django.contrib.auth.models import User
@@ -1287,9 +1286,6 @@
             }),
     )
 
-    @skip(
-        "XXX: GavinPanella 2015-10-30 bug=1511690: This test keeps failing "
-        "when landing unrelated branches, so has been disabled.")
     @wait_for_reactor
     @inlineCallbacks
     def test__calls_handler_with_update_on_create(self):
@@ -2909,7 +2905,7 @@
 
     scenarios = (
         ('node', {
-            'params': {'installable': True},
+            'params': {'installable': True, 'with_boot_disk': True},
             'listener': 'node',
             }),
     )