0001-hobo_deploy-internally-call-import_template-using-te.patch

Nicolas Roche, 12 juin 2019 17:39

Voir les différences: en ligne côte à côte

Subject: [PATCH] hobo_deploy: internally call import_template (using
 tenant_command)

 .../common/management/commands/hobo_deploy.py |  6 +++--
 tests/test_hobo_deploy.py                     | 19 +++++++++------
 tests_schemas/env.json                        |  4 ++--
 tests_schemas/test_hobo_deploy.py             | 23 +++++++------------
 4 files changed, 26 insertions(+), 26 deletions(-)

     from django.conf import settings
     from django.core.management.base import BaseCommand, CommandError
     from django.core.management import call_command, get_commands
     from django.core.management import call_command, execute_from_command_line, get_commands
     from hobo.multitenant.middleware import TenantMiddleware, TenantNotFound
     from hobo.theme.utils import get_theme
-...
             me = [x for x in hobo_environment.get('services') if x.get('this') is True][0]
             if 'import_template' in get_commands() and me.get('template_name'):
                 call_command('import_template', me['template_name'])
                 execute_from_command_line([sys.argv[0], 'tenant_command',
                                            'import_template', me['template_name'],
                                            '--domain', tenant.domain_url])

         assert os.path.exists(theme_path) is False
     @patch('hobo.agent.common.management.commands.hobo_deploy.execute_from_command_line')
     @patch('hobo.agent.common.management.commands.hobo_deploy.get_commands')
     @patch('hobo.agent.common.management.commands.hobo_deploy.call_command')
     def test_configure_template(mocked_call_command, mocked_get_commands):
     def test_configure_template(mocked_get_commands, mocked_execute_from_command_line):
         command = Command()
         tenant = Mock()
         tenant.domain_url = 'combo.dev.publik.love'
         ENVIRONMENT = {'services': [{'service-id': 'combo',
                                      'template_name': 'my_template',
                                      'this': True}]}
-...
         mocked_get_commands.return_value = ['import_template', '...']
         # main case
         command.configure_template(ENVIRONMENT, 'unused')  # TODO: dead tenant parameter
         assert mocked_call_command.mock_calls == [call('import_template', 'my_template')]
         sys.argv[0] = '.../manage.py'
         command.configure_template(ENVIRONMENT, tenant)
         assert mocked_execute_from_command_line.mock_calls == [
             call(['.../manage.py', 'tenant_command', 'import_template', 'my_template',
                   '--domain', 'combo.dev.publik.love'])]
         # no template_name entry provided
         mocked_call_command.reset_mock()
         mocked_execute_from_command_line.reset_mock()
         del ENVIRONMENT['services'][0]['template_name']
         command.configure_template(ENVIRONMENT, 'unused')
         assert mocked_call_command.mock_calls == []
         command.configure_template(ENVIRONMENT, tenant)
         assert mocked_execute_from_command_line.mock_calls == []
     def test_combo_get_theme(fake_themes):

     	    "slug": "agendas",
     	    "title": "CHRONO",
     	    "secret_key": "123",
     	    "template_name": "import_me.txt"
     	    "template_name": "import_me"
     	},
+    	{
     	    "service-id": "wcs",
-...
     	    "slug": "portal",
     	    "title": "COMBO",
     	    "secret_key": "123",
     	    "template_name": "import_me.txt"
     	    "template_name": "import_me"
     	},
+    	{
     	    "service-id": "authentic",

     import os
     import sys
     import mock
     from django.core.management import call_command, get_commands, load_command_class
-...
         assert os.path.exists(tenant_hobo_json)
     @mock.patch('hobo.agent.common.management.commands.hobo_deploy.call_command')
     @mock.patch('hobo.agent.common.management.commands.hobo_deploy.execute_from_command_line')
     @mock.patch('hobo.agent.common.management.commands.hobo_deploy.get_commands')
     def test_import_template(mocked_get_commands, mocked_call_command, db):
     def test_import_template(mocked_get_commands, mocked_execute_from_command_line, db):
         """check 'hobo-deploy' result in '$ chrono-manage import_template' call
         $ chrono-manage hobo_deploy env.json  # simulate this bash query
         warning:
         this test must be the first one executed else 'get_commands' fails to be mocked
         """
         command = load_command_class('hobo.agent.common', 'hobo_deploy')
         domain = 'chrono.dev.publik.love'
         def my_call_command(command, parameter):
             if command == 'import_template':
                 my_call_command.import_template_was_called = True
                 return
             call_command(command, parameter)
         mocked_get_commands.return_value = ['import_template']
         mocked_call_command.side_effect = my_call_command
         my_call_command.import_template_was_called = False
         sys.argv[0] = '.../manage.py'
         command.handle('https://%s/' % domain, 'tests_schemas/env.json')
         assert_deployed(domain)
         # assert the 'import_template' command was called
         assert my_call_command.import_template_was_called is True
         assert mocked_execute_from_command_line.mock_calls == [
             mock.call(['.../manage.py', 'tenant_command',
                        'import_template', 'import_me',
                        '--domain', 'chrono.dev.publik.love'])]
     def test_deploy_on_common_agent(db):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-hobo_deploy-internally-call-import_template-using-te.patch