python3: encoding variations in test_manager

This commit is contained in:
Paul Marillonnet 2020-02-10 17:12:17 +01:00
parent e5a282371b
commit a271cb0a12
1 changed files with 5 additions and 4 deletions

View File

@ -27,6 +27,7 @@ from authentic2.a2_rbac.utils import get_default_ou
from django_rbac.utils import get_ou_model, get_role_model
from django.contrib.auth import get_user_model
from django.utils.encoding import force_bytes
from django.utils.six.moves.urllib.parse import urlparse
from utils import login, get_link_from_mail
@ -636,7 +637,7 @@ def test_manager_site_import(app, db, superuser):
}]
}
form['site_json'] = Upload(
'site_export.json', json.dumps(site_export).encode('ascii'), 'application/octet-stream')
'site_export.json', force_bytes(json.dumps(site_export).encode('ascii')), 'application/octet-stream')
res = form.submit()
assert res.status_code == 302
assert Role.objects.get(slug='basic')
@ -661,7 +662,7 @@ def test_manager_site_import_error(app, db, superuser):
}]
}
form['site_json'] = Upload(
'site_export.json', json.dumps(site_export).encode('ascii'), 'application/octet-stream')
'site_export.json', force_bytes(json.dumps(site_export).encode('ascii')), 'application/octet-stream')
res = form.submit()
assert res.status_code == 200
assert 'missing Organizational Unit' in res.text
@ -669,7 +670,7 @@ def test_manager_site_import_error(app, db, superuser):
Role.objects.get(slug='basic')
form['site_json'] = Upload(
'site_export.json', json.dumps([]), 'application/octet-stream')
'site_export.json', force_bytes(json.dumps([])), 'application/octet-stream')
res = form.submit()
assert res.status_code == 200
@ -782,7 +783,7 @@ def test_manager_create_user_next_form_error(superuser_or_admin, app, ou1):
form.set('last_name', 'Doe')
form.set('email', 'jd') # erroneous
form.set('password1', 'notvalid') # erroneous
assert '<input type="hidden" name="next" value="%s">' % next_url in form.submit().body
assert force_bytes('<input type="hidden" name="next" value="%s">' % next_url) in form.submit().body
def test_manager_add_user_querystring(superuser_or_admin, app, ou1):