URL: https://github.com/freeipa/freeipa/pull/1135 Author: stlaz Title: #1135: [Backport][ipa-4-6] tests_py3: decode get_file_contents() result Action: opened
PR body: """ This PR was opened automatically because PR #1118 was pushed to master and backport to ipa-4-6 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1135/head:pr1135 git checkout pr1135
From f14122c6367a1ce83f51a3fc948ed6c96dc26d46 Mon Sep 17 00:00:00 2001 From: Michal Reznik <mrez...@redhat.com> Date: Fri, 29 Sep 2017 07:43:30 +0200 Subject: [PATCH] tests_py3: decode get_file_contents() result When running tests in python3 we get bytes object instead of bytestring from get_file_contents() and when passing it to run_command() we later fail on concatenation in shell_quote(). https://pagure.io/freeipa/issue/7131 --- ipatests/pytest_plugins/integration/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py index 9988259dc8..efefb51173 100644 --- a/ipatests/pytest_plugins/integration/tasks.py +++ b/ipatests/pytest_plugins/integration/tasks.py @@ -228,7 +228,7 @@ def restore_files(host): def restore_hostname(host): backupname = os.path.join(host.config.test_dir, 'backup_hostname') try: - hostname = host.get_file_contents(backupname) + hostname = host.get_file_contents(backupname, encoding='utf-8') except IOError: logger.debug('No hostname backed up on %s', host.hostname) else:
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
