From 8cfb6032b459b1a34ab26e9ee23b75239c0b1d2b Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Feb 19 2018 17:26:50 +0000 Subject: PR#806: honour runroot --quiet for old-style call Merges #806 https://pagure.io/koji/pull-request/806 Fixes: #807 https://pagure.io/koji/issue/807 runroot CLI ignores --quiet --- diff --git a/plugins/cli/runroot.py b/plugins/cli/runroot.py index f8d4b50..8e8e660 100644 --- a/plugins/cli/runroot.py +++ b/plugins/cli/runroot.py @@ -86,11 +86,12 @@ def handle_runroot(options, session, args): print("User interrupt: canceling runroot task") session.cancelTask(task_id) raise - output = list_task_output_all_volumes(session, task_id) - if 'runroot.log' in output: - for volume in output['runroot.log']: - log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume) - sys.stdout.write(log) + if not opts.quiet: + output = list_task_output_all_volumes(session, task_id) + if 'runroot.log' in output: + for volume in output['runroot.log']: + log = session.downloadTaskOutput(task_id, 'runroot.log', volume=volume) + sys.stdout.write(log) info = session.getTaskInfo(task_id) if info is None: sys.exit(1) diff --git a/tests/test_plugins/test_runroot_cli.py b/tests/test_plugins/test_runroot_cli.py index 9f57833..c1e23fe 100644 --- a/tests/test_plugins/test_runroot_cli.py +++ b/tests/test_plugins/test_runroot_cli.py @@ -18,6 +18,7 @@ class TestListCommands(unittest.TestCase): def setUp(self): self.options = mock.MagicMock() self.options.debug = False + self.options.quiet = False self.session = mock.MagicMock() self.session.getAPIVersion.return_value = koji.API_VERSION self.args = [