From ec91ea59b1c0c6d90ca5a832caa671933626a2d9 Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Tue, 24 Mar 2020 12:38:37 +0100 Subject: [PATCH] python3: replace json string parser input by text (#40911) --- tests/test_nanterre.py | 3 ++- tests/test_nanterre_fragments.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test_nanterre.py b/tests/test_nanterre.py index 54186bd..ebd1c3a 100644 --- a/tests/test_nanterre.py +++ b/tests/test_nanterre.py @@ -10,6 +10,7 @@ import pytest import httmock from django.core.urlresolvers import reverse +from django.utils.encoding import force_text from django.utils.http import urlencode from django.utils.six.moves.urllib import parse as urlparse 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)) 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 len(req_content['fragments']) == 3 assert req_content['fragments'][0]['type'] == 'maj-adresse' diff --git a/tests/test_nanterre_fragments.py b/tests/test_nanterre_fragments.py index 52ebdde..0631bcc 100644 --- a/tests/test_nanterre_fragments.py +++ b/tests/test_nanterre_fragments.py @@ -4,6 +4,7 @@ import json import httmock from django.core.urlresolvers import reverse +from django.utils.encoding import force_text from zoo.zoo_nanterre.fragments import Synchronization from zoo.models import Job @@ -28,7 +29,7 @@ def test_synchro_full(app, nanterre_classic_family): @httmock.urlmatch() def technocarte_ok(url, request): - request_bodies.append(json.loads(request.body)) + request_bodies.append(json.loads(force_text(request.body))) return httmock.response( 200, [ { @@ -227,7 +228,7 @@ def test_infor(app, nanterre_classic_family): @httmock.urlmatch() def infor_ok(url, request): - request_bodies.append(json.loads(request.body)) + request_bodies.append(json.loads(force_text(request.body))) return httmock.response( 200, { 'http_code': 200, @@ -276,7 +277,7 @@ def test_infor(app, nanterre_classic_family): @httmock.urlmatch() def infor_nok(url, request): - request_bodies.append(json.loads(request.body)) + request_bodies.append(json.loads(force_text(request.body))) return httmock.response( 200, { 'http_code': 500,