sts-sponsors team mailing list archive

[Alberto Donato <mp+437442@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:fix-flaky-test into maas:master.

Commit message:
fix flaky query count test.

maasserver.api.tests.test_fabrics:TestFabricsAPI.test_read_has_constant_number_of_queries
might fail based on whether multiple spaces are created (since that results in
extra queries)



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/437442
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/src/maasserver/api/tests/test_fabrics.py b/src/maasserver/api/tests/test_fabrics.py
index ab8ccea..0f23223 100644
--- a/src/maasserver/api/tests/test_fabrics.py
+++ b/src/maasserver/api/tests/test_fabrics.py
@@ -29,17 +29,19 @@ def get_fabric_uri(fabric):
 
 
 def make_complex_fabric():
+    # use a single space for all VLANs to avoid extra queries based on whether
+    # other spaces are created
+    space = factory.make_Space()
     fabric = factory.make_Fabric()
     vlans = [fabric.get_default_vlan()]
     for _ in range(3):
-        vlan = factory.make_VLAN(fabric=fabric)
+        vlan = factory.make_VLAN(fabric=fabric, dhcp_on=True, space=space)
         rack_controller = factory.make_RackController(vlan=vlan)
-        vlan.dhcp_on = True
         vlan.primary_rack = rack_controller
         vlan.save()
         vlans.append(vlan)
     for vlan in vlans:
-        factory.make_VLAN(fabric=fabric, relay_vlan=vlan)
+        factory.make_VLAN(fabric=fabric, relay_vlan=vlan, space=space)
     return fabric