Merge pull request #947 from helgi/cleanup_tests

Cleanup tests and start splitting them out

Author: helgi

rootfs/api/tests/__init__.py

@@ -6,6 +6,7 @@
 
 from django.conf import settings
 from django.test.runner import DiscoverRunner
+from rest_framework.test import APITestCase, APITransactionTestCase
 
 
 def mock_port(*args, **kwargs):
@@ -53,3 +54,27 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
         logging.disable(logging.ERROR)
         return super(SilentDjangoTestSuiteRunner, self).run_tests(
             test_labels, extra_tests, **kwargs)
+
+
+class DeisTestCase(APITestCase):
+    def create_app(self, name=None):
+        body = {}
+        if name:
+            body = {'id': name}
+
+        response = self.client.post('/v2/apps', body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertIn('id', response.data)
+        return response.data['id']
+
+
+class DeisTransactionTestCase(APITransactionTestCase):
+    def create_app(self, name=None):
+        body = {}
+        if name:
+            body = {'id': name}
+
+        response = self.client.post('/v2/apps', body)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertIn('id', response.data)
+        return response.data['id']

rootfs/api/tests/deployments/test_app.py

@@ -11,14 +11,12 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App
 from scheduler import KubeException
 
-from api.tests import adapter
-from api.tests import mock_port
+from api.tests import adapter, mock_port, DeisTestCase
 import requests_mock
 
 
@@ -34,7 +32,7 @@ def _mock_run(*args, **kwargs):
 @requests_mock.Mocker(real_http=True, adapter=adapter)
 @mock.patch('api.models.release.publish_release', lambda *args: None)
 @mock.patch('api.models.release.docker_get_port', mock_port)
-class AppTest(APITestCase):
+class AppTest(DeisTestCase):
     """Tests creation of applications"""
 
     fixtures = ['tests.json']
@@ -52,14 +50,7 @@ def test_app(self, mock_requests):
         """
         Test that a user can create, read, update and delete an application
         """
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']  # noqa
-        self.assertIn('id', response.data)
-        response = self.client.get('/v2/apps')
-        self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['results']), 1)
+        app_id = self.create_app()
         url = '/v2/apps/{app_id}'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
@@ -186,12 +177,7 @@ def test_app_reserved_names(self, mock_requests):
 
     def test_app_structure_is_valid_json(self, mock_requests):
         """Application structures should be valid JSON objects."""
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
-        self.assertIn('structure', response.data)
-        self.assertEqual(response.data['structure'], {})
+        app_id = self.create_app()
         app = App.objects.get(id=app_id)
         app.structure = {'web': 1}
         app.save()

rootfs/api/tests/deployments/test_build.py

@@ -11,24 +11,22 @@
 from django.core.cache import cache
 from django.conf import settings
 from django.test import override_settings
-from rest_framework.test import APITransactionTestCase
 from unittest import mock
 from rest_framework.authtoken.models import Token
 
 from api.models import Build
 from registry.dockerclient import RegistryException
 from scheduler import KubeException
 
-from api.tests import adapter
-from api.tests import mock_port
+from api.tests import adapter, mock_port, DeisTransactionTestCase
 import requests_mock
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
 @requests_mock.Mocker(real_http=True, adapter=adapter)
 @mock.patch('api.models.release.publish_release', lambda *args: None)
 @mock.patch('api.models.release.docker_get_port', mock_port)
-class BuildTest(APITransactionTestCase):
+class BuildTest(DeisTransactionTestCase):
 
     """Tests build notification from build system"""
 
@@ -47,10 +45,7 @@ def test_build(self, mock_requests):
         """
         Test that a null build is created and that users can post new builds
         """
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
         # check to see that no initial build was created
         url = "/v2/apps/{app_id}/builds".format(**locals())
         response = self.client.get(url)
@@ -109,10 +104,7 @@ def test_response_data(self, mock_requests):
         self.assertDictContainsSubset(expected, response.data)
 
     def test_build_default_containers(self, mock_requests):
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
         # post an image as a build
         url = "/v2/apps/{app_id}/builds".format(**locals())
         body = {'image': 'autotest/example'}
@@ -133,10 +125,7 @@ def test_build_default_containers(self, mock_requests):
             self.assertRegex(container['name'], app_id + '-v2-cmd-[a-z0-9]{5}')
 
         # start with a new app
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
         # post a new build with procfile
         url = "/v2/apps/{app_id}/builds".format(**locals())
         body = {
@@ -161,10 +150,7 @@ def test_build_default_containers(self, mock_requests):
             self.assertRegex(container['name'], app_id + '-v2-cmd-[a-z0-9]{5}')
 
         # start with a new app
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
 
         # post a new build with procfile
         url = "/v2/apps/{app_id}/builds".format(**locals())
@@ -193,10 +179,7 @@ def test_build_default_containers(self, mock_requests):
             self.assertRegex(container['name'], app_id + '-v2-cmd-[a-z0-9]{5}')
 
         # start with a new app
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
         # post a new build with procfile
 
         url = "/v2/apps/{app_id}/builds".format(**locals())
@@ -226,10 +209,7 @@ def test_build_default_containers(self, mock_requests):
 
     def test_build_str(self, mock_requests):
         """Test the text representation of a build."""
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
         # post a new build
         url = "/v2/apps/{app_id}/builds".format(**locals())
         body = {'image': 'autotest/example'}
@@ -248,10 +228,7 @@ def test_admin_can_create_builds_on_other_apps(self, mock_requests):
         token = Token.objects.get(user=user).key
         self.client.credentials(HTTP_AUTHORIZATION='Token ' + token)
 
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
 
         # post a new build as admin
         self.client.credentials(HTTP_AUTHORIZATION='Token ' + self.token)
@@ -289,10 +266,7 @@ def test_new_build_does_not_scale_up_automatically(self, mock_requests):
         After the first initial deploy, if the containers are scaled down to zero,
         they should stay that way on a new release.
         """
-        url = '/v2/apps'
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 201, response.data)
-        app_id = response.data['id']
+        app_id = self.create_app()
 
         # post a new build
         url = "/v2/apps/{app_id}/builds".format(**locals())

rootfs/api/tests/deployments/test_certificate.py

@@ -1,16 +1,15 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 from django.core.exceptions import SuspiciousOperation
 
 from api.models import App, Certificate
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateTest(APITestCase):
+class CertificateTest(DeisTestCase):
 
     """Tests creation of domain SSL certificates"""
 

rootfs/api/tests/deployments/test_certificate_use_case_1.py

@@ -1,15 +1,14 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateUseCase1Test(APITestCase):
+class CertificateUseCase1Test(DeisTestCase):
 
     """
     Tests creation of domain SSL certificate and attach the

rootfs/api/tests/deployments/test_certificate_use_case_2.py

@@ -1,15 +1,14 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateUseCase2Test(APITestCase):
+class CertificateUseCase2Test(DeisTestCase):
 
     """
     Tests creation of 2 domains and SSL certificate.

rootfs/api/tests/deployments/test_certificate_use_case_3.py

@@ -1,15 +1,14 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateUseCase3Test(APITestCase):
+class CertificateUseCase3Test(DeisTestCase):
 
     """
     Tests creation of 2 domains and 2 SSL certificate.

rootfs/api/tests/deployments/test_certificate_use_case_4.py

@@ -1,15 +1,14 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateUseCase4Test(APITestCase):
+class CertificateUseCase4Test(DeisTestCase):
 
     """
     Tests creation of 3 domains (one is a wildcard) and 3 SSL certificate (no wildcards).

rootfs/api/tests/deployments/test_certificate_use_case_5.py

@@ -1,15 +1,14 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import override_settings
-from rest_framework.test import APITestCase
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Certificate, Domain
-from api.tests import TEST_ROOT
+from api.tests import TEST_ROOT, DeisTestCase
 
 
 @override_settings(DEIS_KUBERNETES_DEPLOYMENTS='1')
-class CertificateUseCase5Test(APITestCase):
+class CertificateUseCase5Test(DeisTestCase):
 
     """
     Tests creation of 3 domains (one is a wildcard) and 2 SSL certificate (one is a wildcard).