launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/backport-r1268 into lp:maas/1.2.

Commit message:
Fix spurious test failure (backport r1268 from trunk)

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/backport-r1268/+merge/137474
-- 
https://code.launchpad.net/~julian-edwards/maas/backport-r1268/+merge/137474
Your team MAAS Maintainers is requested to review the proposed merge of lp:~julian-edwards/maas/backport-r1268 into lp:maas/1.2.

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2012-11-26 02:54:49 +0000
+++ src/maasserver/tests/test_api.py	2012-12-03 05:15:23 +0000
@@ -3525,7 +3525,7 @@
             (parsed_result, NodeGroup.objects.ensure_master().uuid))
 
     def test_register_nodegroup_configures_master_if_unconfigured(self):
-        name = factory.make_name('name')
+        name = factory.make_name('nodegroup')
         uuid = factory.getRandomUUID()
         interface = make_interface_settings()
         self.client.post(
@@ -3538,7 +3538,8 @@
             })
         master = NodeGroup.objects.ensure_master()
         self.assertThat(
-            master.nodegroupinterface_set.all()[0],
+            master.nodegroupinterface_set.get(
+                interface=interface['interface']),
             MatchesStructure.byEquality(**interface))
         self.assertEqual(NODEGROUP_STATUS.ACCEPTED, master.status)