From 5df1e3e6e609a9c5c1a94a53399681ded429fc2c Mon Sep 17 00:00:00 2001 From: Yuming Zhu Date: Aug 08 2017 16:26:22 +0000 Subject: cli: do not print extra blank line when noprogress passed --- diff --git a/cli/koji_cli/lib.py b/cli/koji_cli/lib.py index 26bec95..58f0340 100644 --- a/cli/koji_cli/lib.py +++ b/cli/koji_cli/lib.py @@ -491,7 +491,7 @@ def download_file(url, relpath, quiet=False, noprogress=False, size=None, num=No c.setopt(c.XFERINFOFUNCTION, _download_progress) c.perform() c.close() - if not quiet: + if not (quiet or noprogress): print('') diff --git a/tests/test_cli/test_download_file.py b/tests/test_cli/test_download_file.py index 02ce2ab..8b8cfdb 100644 --- a/tests/test_cli/test_download_file.py +++ b/tests/test_cli/test_download_file.py @@ -79,7 +79,7 @@ class TestDownloadFile(unittest.TestCase): self.reset_mock() download_file("http://url", self.filename, quiet=False, noprogress=True) actual = self.stdout.getvalue() - expected = 'Downloading: %s\n\n' % self.filename + expected = 'Downloading: %s\n' % self.filename self.assertMultiLineEqual(actual, expected) self.assertEqual(self.curl.setopt.call_count, 3)