particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add header separaton to list-hosts and list-channels

Browse source 
Fixes: https://pagure.io/koji/issue/3337
This commit is contained in:
Jana Cupova 2022-04-22 13:07:19 +02:00 • committed by Tomas Kopecek
parent 8732cf0499
commit 3c84d99bf4
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/koji_cli/commands.py
View file

@ -3059,7 +3059,9 @@ def anon_handle_list_channels(goptions, session, args):
longest_channel = 8
if options.simple:
if not options.quiet:
print('Channel')
hdr = 'Channel'
print(hdr)
print(len(hdr) * '-')
for channel in channels:
print(channel['name'])
else:
@ -3072,6 +3074,7 @@ def anon_handle_list_channels(goptions, session, args):
if options.comment and 'comment' in first_item:
hdr += "Comment".ljust(53)
print(hdr)
print(len(hdr) * '-')
mask = "%%(name)-%ss %%(enabled_host)6d %%(ready)6d %%(disabled)6d %%(load)6d %%(" \
"capacity)6d %%(perc_load)6d%%%%" % longest_channel
if options.description and 'description' in first_item:
@ -3185,6 +3188,7 @@ def anon_handle_list_hosts(goptions, session, args):
if options.show_channels:
hdr += "Channels"
print(hdr)
print(len(hdr) * '-')
mask = "%%(name)-%ss %%(enabled)-3s %%(ready)-3s %%(task_load)4.1f/%%(capacity)-4.1f " \
"%%(arches)-16s %%(update)-35s" % longest_host
if options.description:

5
tests/test_cli/test_list_channels.py
View file

@ -56,6 +56,7 @@ class TestListChannels(utils.CliTestCase):
actual = stdout.getvalue()
expected = "Channel Enabled Ready Disbld Load Cap Perc \n" \
"-------------------------------------------------------------\n" \
"default 3 1 0 1 6 22%\n" \
"test [disabled] 2 2 1 1 6 28%\n"
@ -105,6 +106,9 @@ class TestListChannels(utils.CliTestCase):
expected = "Channel Enabled Ready Disbld Load Cap Perc " \
"Description " \
"Comment \n" \
"---------------------------------------------------------------------------" \
"---------------------------------------------------------------------------" \
"-----------------\n" \
"default 3 1 0 1 6 22% " \
"test-description-1 " \
"test-comment-1 \n" \
@ -199,6 +203,7 @@ class TestListChannels(utils.CliTestCase):
actual = stdout.getvalue()
expected = """Channel
-------
default
test [disabled]
"""

4
tests/test_cli/test_list_hosts.py
View file

@ -52,6 +52,7 @@ class TestListHosts(utils.CliTestCase):
self.options.quiet = False
host_update = 1615875554.862938
expected = """Hostname Enb Rdy Load/Cap Arches Last Update
-----------------------------------------------------------------------------------
kojibuilder N Y 0.0/2.0 x86_64 Tue, 16 Mar 2021 06:19:14 UTC
"""
@ -190,6 +191,9 @@ kojibuilder N Y 0.0/2.0 x86_64 Tue, 16 Mar 2021 06:19:14 UTC
expected = "Hostname Enb Rdy Load/Cap Arches Last Update" \
" Description " \
"Comment \n" \
"---------------------------------------------------------------------------" \
"---------------------------------------------------------------------------" \
"-----------------------------------\n" \
"kojibuilder N Y 0.0/2.0 x86_64 Tue, 16 Mar 2021 06:19:14 UTC" \
" test-description test-comment" \
" \n"