Merge lp:~jtv/maas/dhcp-test-trivia into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Break up TestDHCP for manageability. Fix inappropriate ordering sensitivity in get_interfaces_managed_by test, and simplify test using HasLength.

Changes extracted from another branch I have up for review, to keep reviews small and effective.

Jeroen

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'src/maasserver/tests/test_dhcp.py'
--- src/maasserver/tests/test_dhcp.py	2014-08-25 03:14:30 +0000
+++ src/maasserver/tests/test_dhcp.py	2014-08-25 07:10:50 +0000
@@ -40,14 +40,14 @@
 from provisioningserver import tasks
 from provisioningserver.utils.enum import map_enum
 from testresources import FixtureResource
-from testtools.matchers import EndsWith
-
-
-class TestDHCP(MAASServerTestCase):
-
-    resources = (
-        ('celery', FixtureResource(CeleryFixture())),
-        )
+from testtools.matchers import (
+    EndsWith,
+    HasLength,
+    )
+
+
+class TestGetInterfacesManagedBy(MAASServerTestCase):
+    """Tests for `get_interfaces_managed_by`."""
 
     def test_get_interfaces_managed_by_returns_managed_interfaces(self):
         self.patch(settings, "DHCP_CONNECT", False)
@@ -56,10 +56,9 @@
             management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
         self.patch(settings, "DHCP_CONNECT", True)
         managed_interfaces = get_interfaces_managed_by(nodegroup)
-        self.assertNotEqual([], managed_interfaces)
-        self.assertEqual(1, len(managed_interfaces))
-        self.assertEqual(
-            list(nodegroup.nodegroupinterface_set.all()),
+        self.assertThat(managed_interfaces, HasLength(1))
+        self.assertItemsEqual(
+            nodegroup.nodegroupinterface_set.all(),
             managed_interfaces)
 
     def test_get_interfaces_managed_by_returns_None_if_not_accepted(self):
@@ -76,6 +75,14 @@
             {status: None for status in unaccepted_statuses},
             managed_interfaces)
 
+
+class TestConfigureDHCP(MAASServerTestCase):
+    """Tests for `configure_dhcp`."""
+
+    resources = (
+        ('celery', FixtureResource(CeleryFixture())),
+        )
+
     def test_configure_dhcp_stops_server_if_no_managed_interface(self):
         self.patch(settings, "DHCP_CONNECT", True)
         self.patch(dhcp, 'stop_dhcp_server')
@@ -191,28 +198,6 @@
         args, kwargs = dhcp.write_dhcp_config.apply_async.call_args
         self.assertThat(kwargs['kwargs']['omapi_key'], EndsWith('=='))
 
-    def test_dhcp_config_gets_written_when_nodegroup_becomes_active(self):
-        nodegroup = factory.make_node_group(
-            status=NODEGROUP_STATUS.PENDING,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
-        self.patch(settings, "DHCP_CONNECT", True)
-        self.patch(dhcp, 'write_dhcp_config')
-        nodegroup.accept()
-        self.assertEqual(1, dhcp.write_dhcp_config.apply_async.call_count)
-
-    def test_dhcp_config_gets_written_when_nodegroup_name_changes(self):
-        nodegroup = factory.make_node_group(
-            status=NODEGROUP_STATUS.ACCEPTED,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
-        self.patch(settings, "DHCP_CONNECT", True)
-        self.patch(dhcp, 'write_dhcp_config')
-        new_name = factory.make_name('dns name'),
-
-        nodegroup.name = new_name
-        nodegroup.save()
-
-        self.assertEqual(1, dhcp.write_dhcp_config.apply_async.call_count)
-
     def test_write_dhcp_config_task_routed_to_nodegroup_worker(self):
         nodegroup = factory.make_node_group(
             status=NODEGROUP_STATUS.PENDING,
@@ -234,6 +219,36 @@
         args, kwargs = task.subtask.call_args
         self.assertEqual(nodegroup.work_queue, kwargs['options']['queue'])
 
+
+class TestDHCPConnect(MAASServerTestCase):
+    """Tests for DHCP signals triggered when saving a cluster interface."""
+
+    resources = (
+        ('celery', FixtureResource(CeleryFixture())),
+        )
+
+    def test_dhcp_config_gets_written_when_nodegroup_becomes_active(self):
+        nodegroup = factory.make_node_group(
+            status=NODEGROUP_STATUS.PENDING,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
+        self.patch(settings, "DHCP_CONNECT", True)
+        self.patch(dhcp, 'write_dhcp_config')
+        nodegroup.accept()
+        self.assertEqual(1, dhcp.write_dhcp_config.apply_async.call_count)
+
+    def test_dhcp_config_gets_written_when_nodegroup_name_changes(self):
+        nodegroup = factory.make_node_group(
+            status=NODEGROUP_STATUS.ACCEPTED,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
+        self.patch(settings, "DHCP_CONNECT", True)
+        self.patch(dhcp, 'write_dhcp_config')
+        new_name = factory.make_name('dns name'),
+
+        nodegroup.name = new_name
+        nodegroup.save()
+
+        self.assertEqual(1, dhcp.write_dhcp_config.apply_async.call_count)
+
     def test_dhcp_config_gets_written_when_interface_IP_changes(self):
         nodegroup = factory.make_node_group(
             status=NODEGROUP_STATUS.ACCEPTED,