Projet

Général

Profil

0001-don-t-associate-user-if-PhantomJS-response-is-errone.patch

Josué Kouka, 06 février 2017 10:32

Télécharger (2,13 ko)

Voir les différences: 

Subject: [PATCH 1/2] don't associate user if PhantomJS response is erroneous
 (#14813)


 mandayejs/mandaye/utils.py | 4 ++--
 mandayejs/mandaye/views.py | 3 +++
 tests/test_mandayejs.py    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
mandayejs/mandaye/utils.py
44 44 
        try:
45 45 
            result = json.loads(stdout)
46 46 
        except (ValueError,):
47 
            result = {"result": "failure, couldn't decode JSON"}
48 
            logger.error(stdout)
47 
            result = {"result": "json_error"}
48 
            logger.error("invalid json: %s" % stdout)
49 49 

  		




  50
  50
  
    
        if result.get('stderr'):

  		




  51
  51
  
    
            logger.warning(result['stderr'])

  		












  

    
      mandayejs/mandaye/views.py
    
  





  159
  159
  
    
    elif result.get('result') == 'timeout':

  		




  160
  160
  
    
        messages.error(request, _('server took too long to respond'))

  		




  161
  161
  
    
        url = resolve_url('associate')

  		




  
  162
  
    
    elif result.get('result') == 'json_error':

  		




  
  163
  
    
        messages.error(request, _('invalid response from server'))

  		




  
  164
  
    
        url = resolve_url('associate')

  		




  162
  165
  
    
    elif result.get('result') == 'redirect':

  		




  163
  166
  
    
        url = urlparse(result.get('url', '/'))

  		




  164
  167
  
    
        url = url.path

  		












  

    
      tests/test_mandayejs.py
    
  





  255
  255
  
    
        assert record.levelname == 'ERROR'

  		




  256
  256
  
    
        assert record.message == 'This is not a valid JSON'

  		




  257
  257
  
    

  		




  258
  
  
    
    assert result['result'] == "failure, couldn't decode JSON"

  		




  
  258
  
    
    assert result['result'] == "json_error"

  		




  259
  259
  
    

  		




  260
  260
  
    

  		




  261
  261
  
    
@mock.patch('mandayejs.mandaye.utils.subprocess.Popen')

  		




  262
  
  
    
-