[chores] Minor improvements

Author: nemesifier

openwisp_controller/config/tests/test_admin.py

@@ -1991,11 +1991,8 @@ def test_device_changelist_activate_deactivate_admin_action_security(
             )
             self.assertEqual(mocked_deactivate.call_count, 1)
 
-    def test_enforcing_required_template_does_not_recreate_vpn_client(self):
-        """
-        This test verifies that removing and re-adding VPN templates via admin
-        does not recreate VPN clients.
-        """
+    def test_required_template_doesnt_recreate_vpn_client(self):
+        """The required templates logic should not delete VpnClients"""
 
         def _update_template(templates):
             params.update(
@@ -2013,7 +2010,6 @@ def _update_template(templates):
         required_template = self._create_template(
             name="required-template", required=True
         )
-
         # Create VPNs and VPN templates
         vpn1 = self._create_vpn(
             name="test-vpn1",
@@ -2031,17 +2027,15 @@ def _update_template(templates):
             type="vpn",
             vpn=vpn2,
         )
-
         # Add a new device
         path = reverse(f"admin:{self.app_label}_device_add")
         params = self._get_device_params(org=self._get_org())
         response = self.client.post(path, data=params, follow=True)
+        # Verify pre-codintions
         self.assertEqual(response.status_code, 200)
-
         config = Device.objects.first().config
         self.assertEqual(config.vpnclient_set.count(), 0)
         self.assertEqual(config.templates.count(), 1)
-
         # Change to device change form
         path = reverse(f"admin:{self.app_label}_device_change", args=[config.device_id])
         params.update(
@@ -2052,13 +2046,11 @@ def _update_template(templates):
                 "_continue": True,
             }
         )
-
         # Add first VPN template via admin
         _update_template(templates=[required_template, vpn1_template])
         self.assertEqual(config.templates.count(), 2)
         self.assertEqual(config.vpnclient_set.count(), 1)
         vpn1_client = config.vpnclient_set.first()
-
         # Add second VPN template via admin
         _update_template(
             templates=[
@@ -2074,7 +2066,6 @@ def _update_template(templates):
             vpn1_client.pk, config.vpnclient_set.filter(vpn=vpn1).first().pk
         )
         vpn2_client = config.vpnclient_set.filter(vpn=vpn2).first()
-
         # Remove first VPN template via admin
         _update_template(templates=[required_template, vpn2_template])
         self.assertEqual(config.templates.count(), 2)
@@ -2086,7 +2077,6 @@ def _update_template(templates):
         self.assertEqual(
             vpn2_client.pk, config.vpnclient_set.filter(vpn=vpn2).first().pk
         )
-
         # Remove the second VPN template and ensure the required template remains.
         # This verifies that VpnClient object should get deleted it there's only
         # one required template applied.