Projet

Général

Profil

0001-mdel_ddpacs-use-0-as-default-float-40013.patch

Emmanuel Cazenave, 12 mars 2020 11:55

Télécharger (2,02 ko)

Voir les différences: 

Subject: [PATCH] mdel_ddpacs: use 0 as default float (#40013)


 passerelle/apps/mdel_ddpacs/models.py |  5 ++++-
 tests/test_mdel_ddpacs.py             | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
passerelle/apps/mdel_ddpacs/models.py
76 76 
        return data._replace(text=str(data.text))
77 77 

  		




  78
  78
  
    
    def encode_double(self, obj):

  		




  79
  
  
    
        return float(obj)

  		




  
  79
  
    
        try:

  		




  
  80
  
    
            return float(obj)

  		




  
  81
  
    
        except ValueError:

  		




  
  82
  
    
            return 0.0

  		




  80
  83
  
    

  		




  81
  84
  
    

  		




  82
  85
  
    
class Resource(abstract.Resource):

  		












  

    
      tests/test_mdel_ddpacs.py
    
  





  149
  149
  
    
        assert 'step 1 is inferior' in caplog.messages[-1]

  		




  150
  150
  
    

  		




  151
  151
  
    
        resource.check_status()

  		




  
  152
  
    

  		




  
  153
  
    

  		




  
  154
  
    
def test_create_demand_double(app, resource, ddpacs_payload, freezer, sftpserver, caplog):

  		




  
  155
  
    
    # paramiko log socket errors when connection is closed :/

  		




  
  156
  
    
    caplog.set_level(logging.CRITICAL, 'paramiko.transport')

  		




  
  157
  
    
    freezer.move_to('2019-01-01')

  		




  
  158
  
    

  		




  
  159
  
    
    # Push new demand

  		




  
  160
  
    
    payload = {

  		




  
  161
  
    
        'display_id': '1-1',

  		




  
  162
  
    
        'PACS/convention/conventionType/aideMaterielMontant': 'None'

  		




  
  163
  
    
    }

  		




  
  164
  
    
    ddpacs_payload.update(payload)

  		




  
  165
  
    
    assert Demand.objects.count() == 0

  		




  
  166
  
    
    assert resource.jobs_set().count() == 0

  		




  
  167
  
    
    resp = app.post_json('/mdel-ddpacs/test/create?raise=1', params=ddpacs_payload)

  		




  
  168
  
    
    assert resp.json['err'] == 0

  		




  
  169
  
    
    assert resp.json['status'] == 'pending'

  		




  
  170
  
    
    assert Demand.objects.count() == 1

  		




  
  171
  
    
    assert resource.jobs_set().count() == 1

  		




  152
  
  
    
-