diff options
| author | Christian Heimes <cheimes@redhat.com> | 2018-11-07 17:52:03 +0100 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2018-11-08 16:03:21 +0100 |
| commit | e569afb04eddc7eb0b287d9046de05ed8de4772d (patch) | |
| tree | 70eae724f825dfae2582629c06485a7a75703145 | |
| parent | 816783a1b9790dedb360e76883c295bc142e980c (diff) | |
| download | freeipa-e569afb04eddc7eb0b287d9046de05ed8de4772d.tar.gz freeipa-e569afb04eddc7eb0b287d9046de05ed8de4772d.tar.xz freeipa-e569afb04eddc7eb0b287d9046de05ed8de4772d.zip | |
Fix test_cli_fsencoding on Python 3.7, take 2
0a5a7bdef7c300cb8f8a8128ce6cf5b115683cbe introduced another problem. The
test is now failing on systems without a full IPA client or server
installation. Use IPA_CONFDIR env var to override location of
default.conf, so that the command always fails.
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Serhii Tsymbaliuk <stsymbal@redhat.com>
| -rw-r--r-- | ipatests/test_cmdline/test_cli.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py index 056f3e1ec..c857c9902 100644 --- a/ipatests/test_cmdline/test_cli.py +++ b/ipatests/test_cmdline/test_cli.py @@ -333,6 +333,9 @@ def test_cli_fsencoding(): } env['LC_ALL'] = 'C' env['PYTHONPATH'] = BASE_DIR + # override confdir so test always fails and does not depend on an + # existing installation. + env['IPA_CONFDIR'] = '/' p = subprocess.Popen( [sys.executable, '-m', 'ipaclient', 'help'], stdout=subprocess.PIPE, @@ -341,12 +344,12 @@ def test_cli_fsencoding(): ) 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) + assert b'IPA client is not configured' in err, (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) |