It is nice now.

2019-11-16 18:50:53 +01:00
parent 18613d3600
commit f1f0c585b9
21 changed files with 750 additions and 408 deletions
--- a/src/django_deploy/tests/test_program.py
+++ b/src/django_deploy/tests/test_program.py
@@ -1,173 +1,141 @@
-import importlib
 import os
-import sys
-import unittest
-import mock
-import pytest

 from ..config import DJANGO_SETTINGS_DIR
 from ..program import Program

+from .base import DjangoDeployTestCase

-class ProgramTestCase(unittest.TestCase):
-    @pytest.fixture(autouse=True)
-    def tmpdir(self, tmpdir):  # pylint: disable=method-hidden
-        self.tmpdir = tmpdir
-
-    def _assert_django_project(self, project_dir):
-        self.assertTrue(os.path.isdir(project_dir), 'no directory: {}'.format(project_dir))
-        settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_DIR)
-        self.assertTrue(os.path.isdir(settings_dir), 'no directory: {}'.format(settings_dir))
-        settings_file = os.path.join(settings_dir, 'settings.py')
-        self.assertTrue(os.path.isfile(settings_file), 'no file: {}'.format(settings_file))
-        manage_script = os.path.join(project_dir, 'manage.py')
-        self.assertTrue(os.path.isfile(manage_script), 'no file: {}'.format(manage_script))
-
-    def _assert_django_deploy_project(self, project_dir):
-        settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_DIR)
-        settings_file = os.path.join(settings_dir, 'settings.py')
-        urlconf_file = os.path.join(settings_dir, 'urls.py')
-        django_deploy_json = os.path.join(settings_dir, 'django_deploy.json')
-
-        self.assertTrue(os.path.isfile(django_deploy_json), 'no file: {}'.format(django_deploy_json))
-
-        with open(settings_file, 'r') as f:
-            needle = 'from django_deploy import get_installed_apps'
-            haystack = f.read()
-            self.assertIn(needle, haystack)
-
-        with open(urlconf_file, 'r') as f:
-            needle = 'from django_deploy import get_urlpatterns'
-            haystack = f.read()
-            self.assertIn(needle, haystack)

+class ProgramTestCase(DjangoDeployTestCase):
    def setUp(self):
        self._program = Program()
-        self._project_dir = os.path.join(str(self.tmpdir), 'django')
-        self._program(argv=['--create', self._project_dir])
+        self._tmp_dir = str(self.tmpdir)

-    def test_create_new_dir(self):
-        project_dir = os.path.join(str(self.tmpdir), 'new_dir')
+    def test_create(self):
+        project_dir = os.path.join(self._tmp_dir, 'new')
+        exitval = self._program(argv=['--create', project_dir])
+
+        self.assertEqual(os.EX_OK, exitval)
+        self.assert_django_project(project_dir)
+        self.assert_django_deploy_hooks(project_dir)
+
+    def test_create_in_empty_dir(self):
+        project_dir = self._tmp_dir
        exitval = self._program(argv=['-c', project_dir])

-        self.assertEqual(os.EX_OK, exitval, 'program() does not return os.EX_OK')
-        self._assert_django_project(project_dir)
-        self._assert_django_deploy_project(project_dir)
+        self.assertEqual(os.EX_OK, exitval)
+        self.assert_django_project(project_dir)
+        self.assert_django_deploy_hooks(project_dir)

-    def test_create_existing_empty_dir(self):
-        project_dir = os.path.join(str(self.tmpdir), 'empty_dir')
-        os.makedirs(project_dir)
+    def test_create_in_project_dir(self):
+        project_dir = self._tmp_dir
+        self._program(argv=['-c', project_dir])
        exitval = self._program(argv=['-c', project_dir])
+        self.assertNotEqual(os.EX_OK, exitval)

-        self.assertEqual(os.EX_OK, exitval, 'program() does not return os.EX_OK')
-        self._assert_django_project(project_dir)
-        self._assert_django_deploy_project(project_dir)
+    def test_create_without_hooks(self):
+        project_dir = self._tmp_dir
+        exitval = self._program(argv=['-c', '--no-install-hooks', project_dir])

-    def test_create_existing_project_dir(self):
-        exitval = self._program(argv=['-c', self._project_dir])
-        self.assertEqual(os.EX_SOFTWARE, exitval, 'program() does not return os.EX_SOFTWARE'
-                                                  ' when project directory is not empty')
+        self.assertEqual(os.EX_OK, exitval)
+        self.assert_django_project(project_dir)
+        self.assert_no_django_deploy_hooks(project_dir)

-    def test_enable_django_deploy(self):
-        project_dir = os.path.join(str(self.tmpdir), 'pure_django')
-        os.makedirs(project_dir)
+    def test_install_hooks_without_project_dir(self):
+        project_dir = os.path.join(self._tmp_dir, 'new')
+        exitval = self._program(argv=['--install-hooks', project_dir])
+        self.assertNotEqual(os.EX_OK, exitval)
+
+        project_dir = os.path.join(self._tmp_dir)
+        exitval = self._program(argv=['--install-hooks', project_dir])
+        self.assertNotEqual(os.EX_OK, exitval)
+
+    def test_install_hooks_in_pure_django(self):
+        project_dir = self._tmp_dir
        cmd = 'django-admin startproject {name} {path}'.format(name=DJANGO_SETTINGS_DIR,
                                                               path=project_dir)
        os.system(cmd)
-        self._program(argv=['--enable', project_dir])
-        self._assert_django_deploy_project(project_dir)
+        exitval = self._program(argv=['--install-hooks', project_dir])
+        self.assertEqual(os.EX_OK, exitval)
+        self.assert_django_project(project_dir)
+        self.assert_django_deploy_hooks(project_dir)

-    def test_enable_django_deploy_twice(self):
-        exitval = self._program(argv=['-e', self._project_dir])
-        self.assertEqual(os.EX_NOPERM, exitval, 'program() does not return os.EX_NOPERM'
-                                                ' when django_deploy is already enabled')
-
-    def test_merge_installed_apps(self):
-        project_dir = self._project_dir
+    def test_install_hooks_twice(self):
+        project_dir = self._tmp_dir
+        self._program(argv=['-c', project_dir])
+        exitval = self._program(argv=['--install-hooks', project_dir])
+        self.assertEqual(os.EX_SOFTWARE, exitval)

+    def test_install_apps(self):
+        project_dir = self._tmp_dir
        argv = [
-            '-a', 'django_deploy',
-            '-a', 'django_deploy.tests.fake_app1',
+            '-c',
+            '--install-app', 'django_deploy.tests.fake_app1',
+            '--install-app', 'django_deploy.tests.fake_app1',
            '-a', 'django_deploy.tests.fake_app2',
-            project_dir]
-        self._program(argv=argv)
+            project_dir
+        ]
+        exitval = self._program(argv=argv)
+        self.assertEqual(os.EX_OK, exitval)

-        settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_DIR)
-        sys.path.insert(0, settings_dir)
-        settings = importlib.import_module('settings')
-        if sys.version_info.major == 2:  # pragma: no cover
-            reload(settings)  # pylint: disable=undefined-variable
-        else:  # pragma: no cover
-            importlib.reload(settings)  # pylint: disable=no-member
-        sys.path.pop(0)
-
-        expected_installed_apps = [
-            'django.contrib.admin',
-            'django.contrib.auth',
-            'django.contrib.contenttypes',
-            'django.contrib.sessions',
-            'django.contrib.messages',
-            'django.contrib.staticfiles',
+        installed_apps = [
            'django_deploy.tests.fake_app1',
            'django_deploy.tests.fake_app2',
        ]

-        self.assertListEqual(expected_installed_apps, settings.INSTALLED_APPS)
-
-    def test_merge_root_urlconf(self):
-        project_dir = self._project_dir
+        self.assert_installed_apps(project_dir, installed_apps)

+    def test_install_apps_with_error(self):
+        project_dir = self._tmp_dir
        argv = [
-            '-a', 'django_deploy',
+            '-c',
            '-a', 'django_deploy.tests.fake_app1',
+            '-a', 'django_deploy.tests.fake_app0',
            '-a', 'django_deploy.tests.fake_app2',
-            project_dir]
-        self._program(argv=argv)
+            project_dir
+        ]
+        exitval = self._program(argv=argv)
+        self.assertNotEqual(os.EX_OK, exitval)

-        sys.modules['django.contrib'] = mock.MagicMock(name='django.contrib')
-
-        settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_DIR)
-        sys.path.insert(0, settings_dir)
-        root_urlconf = importlib.import_module('urls')
-        if sys.version_info.major == 2:  # pragma: no cover
-            reload(root_urlconf)  # pylint: disable=undefined-variable
-        else:  # pragma: no cover
-            importlib.reload(root_urlconf)  # pylint: disable=no-member
-        sys.path.pop(0)
-
-        # Django 2 vs Django 1
-        if hasattr(root_urlconf, 'path'):  # pragma: no cover
-            expected_urlpatterns = [
-                ('URLPattern', 'admin/', 'django.contrib.admin.site.urls'),
-            ]
-        else:  # pragma: no cover
-            expected_urlpatterns = [
-                ('URLPattern', '^admin/', 'django.contrib.admin.site.urls'),
-            ]
-        expected_urlpatterns += [
-            ('URLResolver', '^fake1/', 'django_deploy.tests.fake_app1.urls'),
-            ('URLResolver', '^fake2/', 'django_deploy.tests.fake_app2.urls'),
+        installed_apps = [
+            'django_deploy.tests.fake_app1',
+            'django_deploy.tests.fake_app2',
        ]

-        real_urlpatterns = root_urlconf.urlpatterns
-        self.assertEqual(len(expected_urlpatterns), len(real_urlpatterns))
+        self.assert_installed_apps(project_dir, installed_apps)

-        for i, expected in enumerate(expected_urlpatterns):
-            real = real_urlpatterns[i]
-            real_class_name = real.__class__.__name__
-            self.assertTrue(real_class_name.endswith(expected[0]))
-            # Django 2 vs. Django 1
-            if real_class_name == 'URLPattern':  # pragma: no cover
-                self.assertEqual(expected[1], str(real.pattern))
-                self.assertTrue(real.callback.startswith("<Mock name='{}' id=".format(expected[2])))
-            elif real_class_name == 'RegexURLPattern':  # pragma: no cover
-                self.assertEqual(expected[1], real.regex.pattern)
-                self.assertTrue(real.callback.startswith("<Mock name='{}' id=".format(expected[2])))
-            elif real_class_name == 'URLResolver':  # pragma: no cover
-                self.assertEqual(expected[1], str(real.pattern))
-                self.assertEqual(expected[2], real.urlconf_name.__name__)
-            elif real_class_name == 'RegexURLResolver':  # pragma: no cover
-                self.assertEqual(expected[1], real.regex.pattern)
-                self.assertEqual(expected[2], real.urlconf_name.__name__)
-            else:  # pragma: no cover
-                self.fail('Unknown urlpattern class: {}'.format(real_class_name))
+    def test_mount_apps(self):
+        project_dir = self._tmp_dir
+        argv = [
+            '-c',
+            '--mount-app', 'django_deploy.tests.fake_app1', 'app1',
+            '--mount-app', 'django_deploy.tests.fake_app1', 'app1',
+            '-m', 'django_deploy.tests.fake_app2', 'app2',
+            project_dir
+        ]
+        exitval = self._program(argv=argv)
+        self.assertEqual(os.EX_OK, exitval)
+
+        urlpatterns = [
+            ('URLResolver', '^app1/', 'django_deploy.tests.fake_app1.urls'),
+            ('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'),
+        ]
+        self.assert_urlpatterns(project_dir, urlpatterns)
+
+    def test_mount_apps_with_errors(self):
+        project_dir = self._tmp_dir
+        self._program(argv=['-c', project_dir])
+        argv = [
+            '-m', 'django_deploy.tests.fake_app1', 'app1',
+            '-m', 'django_deploy.tests.fake_app0', 'app0',
+            '-m', 'django_deploy.tests.fake_app2', 'app2',
+            project_dir
+        ]
+        exitval = self._program(argv=argv)
+        self.assertNotEqual(os.EX_OK, exitval)
+
+        patterns = [
+            ('URLResolver', '^app1/', 'django_deploy.tests.fake_app1.urls'),
+            ('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'),
+        ]
+        self.assert_urlpatterns(project_dir, patterns)