entrouvert
/
zoo
17
0
Fork 0
Code Issues Pull Requests Releases Activity

python3: replace json string parser input by text (#40911)

This commit is contained in:
Nicolas Roche 2020-03-24 12:38:37 +01:00
parent e879263277
commit ec91ea59b1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_nanterre.py
View File

@ -10,6 +10,7 @@ import pytest
import httmock import httmock
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.encoding import force_text
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.six.moves.urllib import parse as urlparse from django.utils.six.moves.urllib import parse as urlparse
from django.utils.timezone import now from django.utils.timezone import now
@ -1271,7 +1272,7 @@ def test_passage_a_la_majorite(db, settings, nanterre_classic_family, freezer):
Job.redo(timestamp=now() + datetime.timedelta(seconds=20)) Job.redo(timestamp=now() + datetime.timedelta(seconds=20))
assert len(requests) == 1 assert len(requests) == 1
req_content = json.loads(requests[0].body) req_content = json.loads(force_text(requests[0].body))
assert req_content['metadonnees']['service'] == 'passage-majorite' assert req_content['metadonnees']['service'] == 'passage-majorite'
assert len(req_content['fragments']) == 3 assert len(req_content['fragments']) == 3
assert req_content['fragments'][0]['type'] == 'maj-adresse' assert req_content['fragments'][0]['type'] == 'maj-adresse'

7
tests/test_nanterre_fragments.py
View File

@ -4,6 +4,7 @@ import json
import httmock import httmock
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.encoding import force_text
from zoo.zoo_nanterre.fragments import Synchronization from zoo.zoo_nanterre.fragments import Synchronization
from zoo.models import Job from zoo.models import Job
@ -28,7 +29,7 @@ def test_synchro_full(app, nanterre_classic_family):
@httmock.urlmatch() @httmock.urlmatch()
def technocarte_ok(url, request): def technocarte_ok(url, request):
request_bodies.append(json.loads(request.body)) request_bodies.append(json.loads(force_text(request.body)))
return httmock.response( return httmock.response(
200, [ 200, [
{ {
@ -227,7 +228,7 @@ def test_infor(app, nanterre_classic_family):
@httmock.urlmatch() @httmock.urlmatch()
def infor_ok(url, request): def infor_ok(url, request):
request_bodies.append(json.loads(request.body)) request_bodies.append(json.loads(force_text(request.body)))
return httmock.response( return httmock.response(
200, { 200, {
'http_code': 200, 'http_code': 200,
@ -276,7 +277,7 @@ def test_infor(app, nanterre_classic_family):
@httmock.urlmatch() @httmock.urlmatch()
def infor_nok(url, request): def infor_nok(url, request):
request_bodies.append(json.loads(request.body)) request_bodies.append(json.loads(force_text(request.body)))
return httmock.response( return httmock.response(
200, { 200, {
'http_code': 500, 'http_code': 500,