Projet

Général

Profil

0001-don-t-link-user-if-PhantomJS-response-is-erroneous-1.patch

Josué Kouka, 30 janvier 2017 15:48

Télécharger (1,44 ko)

Voir les différences: 

Subject: [PATCH] don't link user if PhantomJS response is erroneous (#14813)


 mandayejs/mandaye/utils.py | 3 ++-
 tests/test_mandayejs.py    | 3 ++-
 2 files changed, 4 insertions(+), 2 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"}
47 
            result = {"result": "failure",
48 
                      "reason": "couldn't decode JSON"}
48 49 
            logger.error(stdout)
49 50 

  		




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

  		












  

    
      tests/test_mandayejs.py
    
  





  252
  252
  
    
        assert record.levelname == 'ERROR'

  		




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

  		




  254
  254
  
    

  		




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

  		




  
  255
  
    
    assert result['result'] == "failure"

  		




  
  256
  
    
    assert result['reason'] == "couldn't decode JSON"

  		




  256
  257
  
    

  		




  257
  258
  
    

  		




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

  		




  259
  
  
    
-