IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_cli_fsencoding on Python 3.7

Browse Source 
Starting with Python 3.7, PEP 538 addresses the locale issue. Python now
supports UTF-8 file system encoding with non-UTF-8 C locale.

See: https://docs.python.org/3/whatsnew/3.7.html#whatsnew37-pep538
See: https://pagure.io/freeipa/issue/5887
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2018-11-07 11:52:27 +01:00
parent b8007e14cc
commit 0a5a7bdef7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipatests/test_cmdline/test_cli.py
View File

@ -340,7 +340,13 @@ def test_cli_fsencoding():
env=env, env=env,
) )
out, err = p.communicate() out, err = p.communicate()
assert p.returncode > 0, (out, err)
if sys.version_info >= (3, 7):
# Python 3.7+ has PEP 538: Legacy C Locale Coercion
assert p.returncode == 0, (out, err)
else:
# Python 3.6 does not support UTF-8 fs encoding with non-UTF LC
assert p.returncode != 0, (out, err)
assert b'System encoding must be UTF-8' in err, (out, err) assert b'System encoding must be UTF-8' in err, (out, err)