From 446334fb958040ed04f2b35d2c65c80e4d6eded5 Mon Sep 17 00:00:00 2001 From: fdiprete Date: Wed, 28 Jul 2021 17:48:10 +0000 Subject: [PATCH] show and log command when using the run_blocking_cmd() method [RHELCMP-2243] Signed-off-by: fdiprete --- pungi/wrappers/kojiwrapper.py | 1 + tests/test_koji_wrapper.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py index 74e3195d..1e67097f 100644 --- a/pungi/wrappers/kojiwrapper.py +++ b/pungi/wrappers/kojiwrapper.py @@ -534,6 +534,7 @@ class KojiWrapper(object): retcode, output = run( command, can_fail=True, + show_cmd=True, logfile=log_file, env=env, buffer_size=-1, diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py index 1b529473..4c533fce 100644 --- a/tests/test_koji_wrapper.py +++ b/tests/test_koji_wrapper.py @@ -720,6 +720,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): "cmd", can_fail=True, logfile=None, + show_cmd=True, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, universal_newlines=True, @@ -745,6 +746,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={ "KRB5CCNAME": "DIR:/tmp/foo", @@ -772,6 +774,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile="logfile", env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -795,6 +798,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -818,6 +822,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -842,6 +847,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -871,6 +877,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -901,6 +908,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -944,6 +952,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1, @@ -980,6 +989,7 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase): mock.call( "cmd", can_fail=True, + show_cmd=True, logfile=None, env={"FOO": "BAR", "PYTHONUNBUFFERED": "1"}, buffer_size=-1,