From 900fad5360524d65f97c148dc89ddd2e94254822 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 14 Nov 2023 12:18:20 +0000 Subject: [PATCH] tests: Remove unused flag Nothing is setting 'merge_stderr'. It looks like a carry-over from the legacy clients. Change-Id: I32b65830e11b27ba83dfba002bf996af561b0768 Signed-off-by: Stephen Finucane --- openstackclient/tests/functional/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py index 86fca8fe83..18ff65baf1 100644 --- a/openstackclient/tests/functional/base.py +++ b/openstackclient/tests/functional/base.py @@ -24,12 +24,12 @@ ADMIN_CLOUD = os.environ.get('OS_ADMIN_CLOUD', 'devstack-admin') LOG = logging.getLogger(__name__) -def execute(cmd, fail_ok=False, merge_stderr=False): +def execute(cmd, *, fail_ok=False): """Executes specified command for the given action.""" LOG.debug('Executing: %s', cmd) cmdlist = shlex.split(cmd) stdout = subprocess.PIPE - stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE + stderr = subprocess.PIPE proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr)