test(ingress): add tests to ingress

Author: duanhongyi

rootfs/api/models/appsettings.py

@@ -1,6 +1,7 @@
 import logging
 from django.conf import settings
 from django.db import models
+from django.db import transaction
 from django.contrib.postgres.fields import ArrayField
 from jsonfield import JSONField
 from rest_framework.exceptions import NotFound
@@ -83,7 +84,6 @@ def update_whitelist(self, previous_settings):
         if new is None and old is not None:
             setattr(self, 'whitelist', old)
         elif set(old) != set(new):
-            self.app.whitelist(new)
             added = ', '.join(k for k in set(new)-set(old))
             added = 'added ' + added if added else ''
             deleted = ', '.join(k for k in set(old)-set(new))
@@ -166,6 +166,7 @@ def update_label(self, previous_settings):
                     self.summary += ' and '
                 self.summary += ["{} {}".format(self.owner, changes)]
 
+    @transaction.atomic
     def save(self, *args, **kwargs):
         self.summary = []
         previous_settings = None
@@ -191,5 +192,8 @@ def save(self, *args, **kwargs):
             raise AlreadyExists("{} changed nothing".format(self.owner))
 
         summary = ' '.join(self.summary)
+        try:
+            return super(AppSettings, self).save(**kwargs)
+        finally:
+            self.app.refresh()
         self.app.log('summary of app setting changes: {}'.format(summary), logging.DEBUG)
-        return super(AppSettings, self).save(**kwargs)

rootfs/api/tests/test_app_settings.py

@@ -184,7 +184,7 @@ def test_kubernetes_service_failure(self, mock_requests):
             addresses = ["2.3.4.5"]
             url = '/v2/apps/{}/whitelist'.format(app_id)
             response = self.client.post(url, {'addresses': addresses})
-            self.assertEqual(response.status_code, 400, response.data)
+            self.assertEqual(response.status_code, 201, response.data)
 
     def test_autoscale(self, mock_requests):
         """

rootfs/api/tests/test_domain.py

@@ -11,7 +11,6 @@
 
 from api.models import Domain
 from api.tests import DryccTestCase
-from scheduler import KubeException
 
 import idna
 
@@ -325,22 +324,9 @@ def test_kubernetes_service_failure(self):
         """
         app_id = self.create_app()
 
-        # scheduler.svc.get exception
-        with mock.patch('scheduler.resources.service.Service.get') as mock_kube:
-            mock_kube.side_effect = KubeException('Boom!')
-            domain = 'foo.com'
-            url = '/v2/apps/{}/domains'.format(app_id)
-            response = self.client.post(url, {'domain': domain})
-            self.assertEqual(response.status_code, 503, response.data)
-
         # scheduler.svc.update exception
-        with mock.patch('scheduler.resources.service.Service.update') as mock_kube:
+        with mock.patch('scheduler.resources.service.Service.update'):
             domain = 'foo.com'
             url = '/v2/apps/{}/domains'.format(app_id)
             response = self.client.post(url, {'domain': domain})
             self.assertEqual(response.status_code, 201, response.data)
-
-            mock_kube.side_effect = KubeException('Boom!')
-            url = '/v2/apps/{}/domains/{}'.format(app_id, domain)
-            response = self.client.delete(url)
-            self.assertEqual(response.status_code, 503, response.data)

rootfs/scheduler/tests/test_ingress.py

@@ -31,7 +31,7 @@ def test_get_ingress(self):
 
         self.scheduler.ns.create("test-ingress-create")
         self.scheduler.ingress.create("test-ingress-create", "nginx",
-                                      "test-ingress-create", "test-ingress-create")
+                                      "test-ingress-create", hosts=["test-ingress-create", ])
         response = self.scheduler.ingress.get("test-ingress-create", "test-ingress-create")
         data = response.json()
 
@@ -50,6 +50,6 @@ def test_delete_failure(self):
     def test_delete_namespace(self):
         self.scheduler.ns.create("test-ingress-delete")
         self.scheduler.ingress.create("test-ingress-delete", "nginx",
-                                      "test-ingress-delete", "test-ingress-delete")
+                                      "test-ingress-delete", hosts=["test-ingress-delete", ])
         response = self.scheduler.ingress.delete("test-ingress-delete", "test-ingress-delete")
         self.assertEqual(response.status_code, 200, response.json())