Projet

Général

Profil

0001-python3-reapply-36273-and-correct-error-in-test-4028.patch

Nicolas Roche, 01 mars 2020 12:15

Télécharger (2,57 ko)

Voir les différences: 

Subject: [PATCH] python3: reapply #36273 and correct error in test (#40286)


 hobo/agent/common/management/commands/hobo_deploy.py | 2 +-
 tests/test_hobo_deploy.py                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
hobo/agent/common/management/commands/hobo_deploy.py
131 131 
            try:
132 132 
                response = requests.get(idp_url, verify=False)
133 133 
            except requests.exceptions.RequestException:
134 134 
                continue
135 135 
            if response.status_code != 200:
136 136 
                continue
137 137 
            tenant_idp_metadata = os.path.join(tenant.get_directory(),
138 138 
                    'idp-metadata-%s.xml' % service.get('id'))
139 
            replace_file(tenant_idp_metadata, response.content)
139 
            replace_file(tenant_idp_metadata, response.text)
140 140 
            # break now, only a single IdP is supported
141 141 
            break
142 142 

  		




  143
  143
  
    
    def get_theme(self, hobo_environment):

  		




  144
  144
  
    
        theme_id = None

  		




  145
  145
  
    
        if self.me:

  		




  146
  146
  
    
            theme_id = self.me.get('variables', {}).get('theme')

  		




  147
  147
  
    
        if not theme_id:

  		












  

    
      tests/test_hobo_deploy.py
    
  





  216
  216
  
    

  		




  217
  217
  
    
@patch('hobo.agent.common.management.commands.hobo_deploy.requests.get')

  		




  218
  218
  
    
def test_configure_service_provider(mocked_get, tmpdir):

  		




  219
  219
  
    
    """create TENANT/idp-metadata-ID.xml file"""

  		




  220
  220
  
    
    command = Command()

  		




  221
  221
  
    
    tenant = Mock()

  		




  222
  222
  
    
    tenant.get_directory = Mock(return_value=str(tmpdir))

  		




  223
  223
  
    
    response1 = Response()

  		




  224
  
  
    
    response1._content = 'my saml idp metadata (1)'

  		




  
  224
  
    
    response1._content = b'my saml idp metadata (1)'

  		




  225
  225
  
    
    response1.status_code = 200

  		




  226
  226
  
    
    response2 = Response()

  		




  227
  
  
    
    response2._content = 'my saml idp metadata (2)'

  		




  
  227
  
    
    response2._content = b'my saml idp metadata (2)'

  		




  228
  228
  
    
    response2.status_code = 200

  		




  229
  229
  
    
    tenant_idp_metadata = '%s/idp-metadata-%s.xml' % (str(tmpdir), '1')

  		




  230
  230
  
    

  		




  231
  231
  
    
    ENVIRONMENT = {'services': [

  		




  232
  232
  
    
        {'service-id': 'combo',

  		




  233
  233
  
    
         'saml-idp-metadata-url': 'https://combo.dev.publik.love/accounts/mellon/metadata/',

  		




  234
  234
  
    
         'id': 1},

  		




  235
  235
  
    
        {'service-id': 'wcs',

  		




  236
  
  
    
-