From a73d70f7ebe194337d7732fd644384c94c2ce0d5 Mon Sep 17 00:00:00 2001 From: Fabiano FidĂȘncio Date: Mar 26 2018 18:55:36 +0000 Subject: TESTS: Move get_call_output() to util.py This function will be reused outside of test_sssctl.py. Related: https://pagure.io/SSSD/sssd/issue/3658 Signed-off-by: Fabiano FidĂȘncio Reviewed-by: Jakub Hrozek --- diff --git a/src/tests/intg/test_sssctl.py b/src/tests/intg/test_sssctl.py index 0df5d0b..e8861dd 100644 --- a/src/tests/intg/test_sssctl.py +++ b/src/tests/intg/test_sssctl.py @@ -28,7 +28,7 @@ import signal import ds_openldap import ldap_ent import config -from util import unindent +from util import unindent, get_call_output import sssd_netgroup LDAP_BASE_DN = "dc=example,dc=com" @@ -203,13 +203,6 @@ def fqname_case_insensitive_rfc2307(request, ldap_conn): return None -def get_call_output(cmd): - process = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - output, ret = process.communicate() - return output.decode('utf-8') - - def test_user_show_basic_sanity(ldap_conn, sanity_rfc2307, portable_LC_ALL): # Fill the cache first ent.assert_passwd_by_name( diff --git a/src/tests/intg/util.py b/src/tests/intg/util.py index 2b40311..a1c4396 100644 --- a/src/tests/intg/util.py +++ b/src/tests/intg/util.py @@ -78,3 +78,10 @@ def restore_envvar_file(name): path = os.environ[name] backup_path = path + ".bak" os.rename(backup_path, path) + + +def get_call_output(cmd): + process = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + output, ret = process.communicate() + return output.decode('utf-8')