From b66febff0f8cad941e00b40e6cf286ef567af04a Mon Sep 17 00:00:00 2001 From: Ondrej Nosek Date: May 17 2021 00:59:18 +0000 Subject: list-side-tags: show creator of the tag Show creator's user id and name in the list of side-tags. JIRA: RHELCMP-103 Fixes: https://pagure.io/fedpkg/issue/358 Signed-off-by: Ondrej Nosek --- diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py index 002a1a0..aa38980 100644 --- a/pyrpkg/cli.py +++ b/pyrpkg/cli.py @@ -2165,7 +2165,7 @@ class cliClient(object): user = self.args.tag_owner or (self.user if self.args.mine else None) tags = self.cmd.list_side_tags(base_tag=self.args.base_tag, user=user) for tag in sorted(tags, key=lambda t: t["name"]): - print("%(name)s\t(id %(id)d)" % tag) + print("%(name)s\t(id %(id)d)\t(user %(user_name)s|%(user_id)s)" % tag) def local(self): self.sources() diff --git a/tests/test_side_tag.py b/tests/test_side_tag.py index 8507062..2ce7f11 100644 --- a/tests/test_side_tag.py +++ b/tests/test_side_tag.py @@ -105,8 +105,8 @@ class ListSideTagTestCase(BaseCase): def test_list_all(self): cli = self.new_cli(["list-side-tags"]) cli.cmd._kojisession.listSideTags.return_value = [ - dict(name="f31-build-side-456", id=1), - dict(name="f30-build-side-1", id=2), + dict(name="f31-build-side-456", id=1, user_name="packager10", user_id="10"), + dict(name="f30-build-side-1", id=2, user_name="packager11", user_id="11"), ] with mock.patch("sys.stdout", new_callable=StringIO) as mock_out: cli.list_side_tags() @@ -118,7 +118,8 @@ class ListSideTagTestCase(BaseCase): self.assertEqual( mock_out.getvalue(), - "f30-build-side-1\t(id 2)\nf31-build-side-456\t(id 1)\n", + "f30-build-side-1\t(id 2)\t(user packager11|11)\n" + "f31-build-side-456\t(id 1)\t(user packager10|10)\n", ) def list_for_base_tag(self):