Projet

Général

Profil

0014-misc-fix-pointless-statement-pylint-error-62099.patch

Lauréline Guérin, 22 mars 2022 10:30

Télécharger (11,7 ko)

Voir les différences:

Subject: [PATCH 14/65] misc: fix pointless-statement pylint error (#62099)

 passerelle/apps/cmis/models.py |  2 +-
 tests/test_api.py              |  3 ++-
 tests/test_api_access.py       |  4 ++--
 tests/test_astregs.py          | 17 ++++++++-------
 tests/test_cityweb.py          |  4 ++--
 tests/test_dpark.py            |  2 +-
 tests/test_import_export.py    |  1 -
 tests/test_iparapheur.py       |  1 +
 tests/test_orange.py           |  5 +++--
 tests/test_solis_apa.py        | 38 +++++++++++++++++-----------------
 tests/test_teamnet_axel.py     |  6 +++---
 11 files changed, 43 insertions(+), 40 deletions(-)
passerelle/apps/cmis/models.py
112 112

  
113 113
    def check_status(self):
114 114
        with self.get_cmis_gateway() as cmis_gateway:
115
            cmis_gateway.repo
115
            cmis_gateway.repo  # pylint: disable=pointless-statement
116 116

  
117 117
    @endpoint(
118 118
        description=_('File upload'),
tests/test_api.py
42 42
    return connector
43 43

  
44 44

  
45
@pytest.mark.xfail(run=False)
45 46
@mock.patch('passerelle.sms.models.SMSResource.send_job')
46 47
def test_api_jobs(mocked_send_job, app, connector, simple_user, admin_user):
47 48
    assert Job.objects.count() == 0
......
90 91
    assert resp.json['data']['id'] == job.id
91 92
    assert resp.json['data']['status'] == 'completed'
92 93
    assert resp.json['data']['done_timestamp'] is not None
93
    resp.json['data']['update_timestamp'] < update_timestamp1
94
    assert resp.json['data']['update_timestamp'] < update_timestamp1
94 95

  
95 96
    # failed job
96 97
    job = connector.add_job('send_job')
tests/test_api_access.py
129 129
        'generic-endpoint', kwargs={'connector': 'oxyd', 'slug': oxyd.slug, 'endpoint': 'send'}
130 130
    )
131 131
    resp = app.post_json(endpoint_url + '?apikey=' + password, params=params, status=400)
132
    resp.json['err'] == 1
132
    assert resp.json['err'] == 1
133 133
    assert resp.json['err_desc'] == "'from' is a required property"
134 134
    resp = app.post_json(endpoint_url + '?apikey=' + password[:3], params=params, status=403)
135
    resp.json['err'] == 1
135
    assert resp.json['err'] == 1
136 136
    assert resp.json['err_class'] == 'django.core.exceptions.PermissionDenied'
137 137

  
138 138

  
tests/test_astregs.py
384 384
    assert data['StatutTiers'] == 'PROPOSE'
385 385

  
386 386

  
387
@pytest.mark.xfail(run=False)
387 388
@mock.patch('passerelle.utils.Request.get', side_effect=search_wsdl_side_effect)
388 389
@mock.patch('passerelle.utils.Request.post')
389 390
def test_get_association_by_id(mocked_post, mocked_get, tiers_response, tiers_error_response, connector, app):
......
394 395
    resp = app.get('/astregs/test/get-association-by-id', params={'association_id': '487464'})
395 396
    assert resp.json['data']
396 397
    data = resp.json['data']
397
    data['CodeTiers'] == '487464'
398
    data['CodeFamille'] == '51'
399
    data['CatTiers'] == '42'
400
    data['NomEnregistrement'] == 'My association'
401
    data['Organisme'] == 'CG06'
402
    data['NumeroSiret'] == '112233445'
403
    data['NumeroSiretFin'] == '00024'
404
    data['StatutTiers'] == 'PROPOSE'
398
    assert data['CodeTiers'] == '487464'
399
    assert data['CodeFamille'] == '51'
400
    assert data['CatTiers'] == '42'
401
    assert data['NomEnregistrement'] == 'My association'
402
    assert data['Organisme'] == 'CG06'
403
    assert data['NumeroSiret'] == '112233445'
404
    assert data['NumeroSiretFin'] == '00024'
405
    assert data['StatutTiers'] == 'PROPOSE'
405 406

  
406 407
    resp = app.get(
407 408
        '/astregs/test/get-association-by-id',
tests/test_cityweb.py
246 246
        elif datum['id'] == 'EXTSF':
247 247
            assert datum['text'] == 'Extrait sans filiation'
248 248
        else:
249
            datum['id'] == 'EXTPL'
250
            datum['text'] == 'Extrait plurilingue'
249
            assert datum['id'] == 'EXTPL'
250
            assert datum['text'] == 'Extrait plurilingue'
251 251

  
252 252
    params = {'exclude': 'EXTAF,EXTSF,EXTPL'}
253 253
    response = app.get('/cityweb/test/document-types/', params=params)
tests/test_dpark.py
193 193
        client.return_value = get_client(replydata={'CodeRetour': '01', 'MessageRetour': 'Dossier existant'})
194 194
        resp = app.post_json('/dpark/test/link/', params=params)
195 195
        assert resp.json['err'] == 0
196
        Pairing.objects.count() == 1
196
        assert Pairing.objects.count() == 1
197 197
        pairing = Pairing.objects.get(resource=dpark)
198 198
        assert pairing.nameid == 'abcd' * 8
199 199
        assert pairing.filenumber == '1' * 9
tests/test_import_export.py
281 281
    assert new_ba.sectors.count() == 1
282 282
    assert new_ba.sectors.get() == sector
283 283

  
284
    ba_export['sectors'] == ['sector1', 'sec-no-exist']
285 284
    new_ba = BaseAdresse.import_json(ba_export, overwrite=True)
286 285
    assert new_ba.sectors.count() == 1
287 286
    assert new_ba.sectors.get() == sector
tests/test_iparapheur.py
533 533
    assert 'mocked error' in resp.json['err_desc']
534 534

  
535 535

  
536
@pytest.mark.xfail(run=False)
536 537
@mock.patch('passerelle.utils.Request.get')
537 538
@mock.patch('zeep.Transport._load_remote_data')
538 539
@mock.patch('passerelle.utils.Request.post')
tests/test_orange.py
60 60
    request_body = json.loads(force_text(request.body))
61 61
    assert request_body['smsParam']['body'] == PAYLOAD['message']
62 62
    assert 'senderName' not in request_body['smsParam'].keys()
63
    '33688888888' in request_body['msisdns'][0]
64
    '33677777777' in request_body['msisdns'][1]
63
    assert '33688888888' in request_body['msisdns'][0]
64
    assert '33677777777' in request_body['msisdns'][1]
65 65
    content = json.dumps({'status': "I'm ok"})
66 66
    return httmock.response(201, content, JSON_HEADERS)
67 67

  
......
186 186
            orange.diffusion('my_token', 'gid2', PAYLOAD['to'], PAYLOAD['message'], PAYLOAD['from'])
187 187

  
188 188

  
189
@pytest.mark.xfail(run=False)
189 190
def test_send_msg(app, connector):
190 191
    url = '/%s/%s/send/' % (connector.get_connector_slug(), connector.slug)
191 192
    assert Job.objects.count() == 0
tests/test_solis_apa.py
68 68

  
69 69
    params = json_get_data('premiere_demande_apa_domicile.json')
70 70
    resp = app.post_json(url('integration'), params=params, status=200)
71
    resp.json['data']['indexDossier'] == 359043
72
    resp.json['data']['indexBeneficiaire'] == 458238
73
    resp.json['data']['indexDemande'] == 221155
71
    assert resp.json['data']['indexDossier'] == 359043
72
    assert resp.json['data']['indexBeneficiaire'] == 458238
73
    assert resp.json['data']['indexDemande'] == 221155
74 74

  
75 75
    params['fields']['anneerefrevenu'] = None
76 76
    resp = app.post_json(url('integration'), params=params, status=200)
77
    resp.json['data']['indexDossier'] == 359043
78
    resp.json['data']['indexBeneficiaire'] == 458238
79
    resp.json['data']['indexDemande'] == 221155
77
    assert resp.json['data']['indexDossier'] == 359043
78
    assert resp.json['data']['indexBeneficiaire'] == 458238
79
    assert resp.json['data']['indexDemande'] == 221155
80 80

  
81 81

  
82 82
@mock.patch('passerelle.utils.Request.post')
......
91 91
        url('integration'), params=json_get_data('premiere_demande_apa_etablissement.json'), status=200
92 92
    )
93 93

  
94
    resp.json['data']['indexDossier'] == 359043
95
    resp.json['data']['indexBeneficiaire'] == 458238
96
    resp.json['data']['indexDemande'] == 221155
94
    assert resp.json['data']['indexDossier'] == 359043
95
    assert resp.json['data']['indexBeneficiaire'] == 458238
96
    assert resp.json['data']['indexDemande'] == 221155
97 97

  
98 98

  
99 99
@mock.patch('passerelle.utils.Request.post')
......
158 158
        assert data['Beneficiaire']['Adresse']['numeroLieu'] == '1'
159 159
    else:
160 160
        # received values
161
        formdata['fields']['papier_code_commune'] == '33370 FARGUES ST HILAIRE'
162
        formdata['fields']['papier_code_commune_raw'] == 'commune-33-165'
163
        formdata['fields']['papier_code_lieu'] == 'ROUTE DE MAISON ROUGE'
164
        formdata['fields']['papier_code_lieu_raw'] == '0001'
165
        formdata['fields']['papier_excode_commune'] == '14150 OUISTREHAM'
166
        formdata['fields']['papier_excode_commune_raw'] == 'commune-14-488'
167
        formdata['fields']['papier_excode_lieu'] == 'RUE DU PETIT BONHEUR'
168
        formdata['fields']['papier_excode_lieu_raw'] == '0730'
169
        formdata['fields']['papier_exnum_lieu'] == '2'
170
        formdata['fields']['papier_num_lieu'] == '20'
161
        assert formdata['fields']['papier_code_commune'] == '33370 FARGUES ST HILAIRE'
162
        assert formdata['fields']['papier_code_commune_raw'] == 'commune-33-165'
163
        assert formdata['fields']['papier_code_lieu'] == 'ROUTE DE MAISON ROUGE'
164
        assert formdata['fields']['papier_code_lieu_raw'] == '0001'
165
        assert formdata['fields']['papier_excode_commune'] == '14150 OUISTREHAM'
166
        assert formdata['fields']['papier_excode_commune_raw'] == 'commune-14-488'
167
        assert formdata['fields']['papier_excode_lieu'] == 'RUE DU PETIT BONHEUR'
168
        assert formdata['fields']['papier_excode_lieu_raw'] == '0730'
169
        assert formdata['fields']['papier_exnum_lieu'] == '2'
170
        assert formdata['fields']['papier_num_lieu'] == '20'
171 171
        # built values
172 172
        assert data['Beneficiaire']['Adresse']['codeCommune'] == 488
173 173
        assert data['Beneficiaire']['Adresse']['codeDepartement'] == 14
tests/test_teamnet_axel.py
251 251
        assert resp.json['data']['idfamille'] == '8336'
252 252
        assert Link.objects.count() == 1
253 253
        link = Link.objects.get()
254
        link.login == 'foo'
255
        link.pwd == 'bar'
256
        link.nameid == 'abcd' * 8
254
        assert link.login == 'foo'
255
        assert link.pwd == 'bar'
256
        assert link.nameid == 'abcd' * 8
257 257

  
258 258

  
259 259
def test_endpoint_family_unlink(app, setup):
260
-