Projet

Général

Profil

0006-django32-use-uppercase-letters-for-clear_tenants_set.patch

Emmanuel Cazenave, 16 janvier 2023 17:38

Télécharger (6,5 ko)

Voir les différences: 

Subject: [PATCH 6/6] django32: use uppercase letters for
 clear_tenants_settings (#67760)

https://code.djangoproject.com/ticket/30234

 hobo/multitenant/settings.py             |  2 +-
 tests_multitenant/test_settings.py       | 18 +++++++++---------
 tests_multitenant/test_tenant_command.py |  6 +++---
 tests_multitenant/test_threading.py      |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)
hobo/multitenant/settings.py
34 34 
        self.__dict__['tenants_settings'] = {}
35 35 
        self.__dict__['default_settings'] = default_settings
36 36 

  		




  37
  
  
    
    def clear_tenants_settings(self):

  		




  
  37
  
    
    def CLEAR_TENANTS_SETTINGS(self):

  		




  38
  38
  
    
        self.__dict__['tenants_settings'] = {}

  		




  39
  39
  
    

  		




  40
  40
  
    
    @property

  		












  

    
      tests_multitenant/test_settings.py
    
  





  39
  39
  
    

  		




  40
  40
  
    

  		




  41
  41
  
    
def test_tenant_json_settings(tenants, settings):

  		




  42
  
  
    
    settings.clear_tenants_settings()

  		




  
  42
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  43
  43
  
    

  		




  44
  44
  
    
    with utilities.patch_default_settings(

  		




  45
  45
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.SettingsJSON',)

  		




  ......




  67
  67
  
    

  		




  68
  68
  
    

  		




  69
  69
  
    
def test_tenant_template_vars(tenants, settings, client):

  		




  70
  
  
    
    django.conf.settings.clear_tenants_settings()

  		




  
  70
  
    
    django.conf.settings.CLEAR_TENANTS_SETTINGS()

  		




  71
  71
  
    

  		




  72
  72
  
    
    with utilities.patch_default_settings(

  		




  73
  73
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.TemplateVars',)

  		




  ......




  99
  99
  
    

  		




  100
  100
  
    

  		




  101
  101
  
    
def test_tenant_settings_vars(tenants, settings, client):

  		




  102
  
  
    
    django.conf.settings.clear_tenants_settings()

  		




  
  102
  
    
    django.conf.settings.CLEAR_TENANTS_SETTINGS()

  		




  103
  103
  
    

  		




  104
  104
  
    
    with utilities.patch_default_settings(

  		




  105
  105
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.SettingsVars',)

  		




  ......




  127
  127
  
    

  		




  128
  128
  
    

  		




  129
  129
  
    
def test_tenant_cors_settings(tenants, settings, client):

  		




  130
  
  
    
    settings.clear_tenants_settings()

  		




  
  130
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  131
  131
  
    

  		




  132
  132
  
    
    with utilities.patch_default_settings(

  		




  133
  133
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.CORSSettings',)

  		




  ......




  148
  148
  
    

  		




  149
  149
  
    

  		




  150
  150
  
    
def test_tenant_theme_settings(tenants, settings, client):

  		




  151
  
  
    
    django.conf.settings.clear_tenants_settings()

  		




  
  151
  
    
    django.conf.settings.CLEAR_TENANTS_SETTINGS()

  		




  152
  152
  
    

  		




  153
  153
  
    
    with utilities.patch_default_settings(

  		




  154
  154
  
    
        settings,

  		




  ......




  183
  183
  
    
def test_known_services(tenants, settings):

  		




  184
  184
  
    
    from hobo.multitenant.settings_loaders import KnownServices

  		




  185
  185
  
    

  		




  186
  
  
    
    settings.clear_tenants_settings()

  		




  
  186
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  187
  187
  
    
    settings.SETTINGS_MODULE = 'fake.settings'

  		




  188
  188
  
    

  		




  189
  189
  
    
    for tenant in tenants:

  		




  ......




  224
  224
  
    

  		




  225
  225
  
    
def test_legacy_urls_mapping(tenants, settings):

  		




  226
  226
  
    

  		




  227
  
  
    
    settings.clear_tenants_settings()

  		




  
  227
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  228
  228
  
    
    settings.SETTINGS_MODULE = 'fake.settings'

  		




  229
  229
  
    

  		




  230
  230
  
    
    for tenant in tenants:

  		




  ......




  235
  235
  
    

  		




  236
  236
  
    

  		




  237
  237
  
    
def test_unique_cookies(tenants, settings):

  		




  238
  
  
    
    settings.clear_tenants_settings()

  		




  
  238
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  239
  239
  
    

  		




  240
  240
  
    
    cookie_names = set()

  		




  241
  241
  
    
    for tenant in tenants:

  		




  ......




  247
  247
  
    

  		




  248
  248
  
    

  		




  249
  249
  
    
def test_tenant_json_settings_reload(tenants, settings, freezer):

  		




  250
  
  
    
    settings.clear_tenants_settings()

  		




  
  250
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  251
  251
  
    

  		




  252
  252
  
    
    with utilities.patch_default_settings(

  		




  253
  253
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.SettingsJSON',)

  		












  

    
      tests_multitenant/test_tenant_command.py
    
  





  49
  49
  
    
def test_all_tenants_disable_cron(handle, tenants, settings):

  		




  50
  50
  
    
    from django.core.management import execute_from_command_line

  		




  51
  51
  
    

  		




  52
  
  
    
    settings.clear_tenants_settings()

  		




  
  52
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  53
  53
  
    
    settings.DISABLE_CRON_JOBS = True

  		




  54
  54
  
    
    handle.side_effect = RecordTenant()

  		




  55
  55
  
    
    execute_from_command_line(['manage.py', 'tenant_command', 'clearsessions', '--all-tenants'])

  		




  ......




  61
  61
  
    
def test_all_tenants_disable_cron_for_specific_tenant(handle, tenants, settings):

  		




  62
  62
  
    
    from django.core.management import execute_from_command_line

  		




  63
  63
  
    

  		




  64
  
  
    
    settings.clear_tenants_settings()

  		




  
  64
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  65
  65
  
    
    disabled_tenant = tenants[0]

  		




  66
  66
  
    
    with open(os.path.join(disabled_tenant.get_directory(), 'settings.json'), 'w') as fd:

  		




  67
  67
  
    
        json.dump(

  		




  ......




  78
  78
  
    
def test_all_tenants_global_disable_cron_with_force_job(handle, tenants, settings):

  		




  79
  79
  
    
    from django.core.management import execute_from_command_line

  		




  80
  80
  
    

  		




  81
  
  
    
    settings.clear_tenants_settings()

  		




  
  81
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  82
  82
  
    
    settings.DISABLE_CRON_JOBS = True

  		




  83
  83
  
    
    handle.side_effect = RecordTenant()

  		




  84
  84
  
    
    execute_from_command_line(

  		












  

    
      tests_multitenant/test_threading.py
    
  





  24
  24
  
    

  		




  25
  25
  
    
def test_thread(tenants, settings, client):

  		




  26
  26
  
    

  		




  27
  
  
    
    settings.clear_tenants_settings()

  		




  
  27
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  28
  28
  
    
    with utilities.patch_default_settings(

  		




  29
  29
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.TemplateVars',)

  		




  30
  30
  
    
    ):

  		




  ......




  87
  87
  
    

  		




  88
  88
  
    

  		




  89
  89
  
    
def test_timer_thread(tenants, settings, client):

  		




  90
  
  
    
    settings.clear_tenants_settings()

  		




  
  90
  
    
    settings.CLEAR_TENANTS_SETTINGS()

  		




  91
  91
  
    
    with utilities.patch_default_settings(

  		




  92
  92
  
    
        settings, TENANT_SETTINGS_LOADERS=('hobo.multitenant.settings_loaders.TemplateVars',)

  		




  93
  93
  
    
    ):

  		




  94
  
  
    
-