Skip to content

Commit 33a04e7

Browse files
nejchJohnVillalovos
authored andcommitted
fix(cli): display items when iterator is returned
1 parent 2f06999 commit 33a04e7

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

gitlab/v4/cli.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,8 @@ def run(
547547
printer.display(data, verbose=True, obj=data)
548548
elif isinstance(data, list):
549549
printer.display_list(data, fields, verbose=verbose)
550+
elif isinstance(data, gitlab.base.RESTObjectList):
551+
printer.display_list(list(data), fields, verbose=verbose)
550552
elif isinstance(data, gitlab.base.RESTObject):
551553
printer.display(get_dict(data, fields), verbose=verbose, obj=data)
552554
elif isinstance(data, str):

tests/functional/cli/test_cli_repository.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,21 @@ def test_list_all_commits(gitlab_cli, project):
4949
assert len(ret_all.stdout) > len(ret.stdout)
5050

5151

52+
def test_list_merge_request_commits(gitlab_cli, merge_request, project):
53+
cmd = [
54+
"project-merge-request",
55+
"commits",
56+
"--project-id",
57+
project.id,
58+
"--iid",
59+
merge_request.iid,
60+
]
61+
62+
ret = gitlab_cli(cmd)
63+
assert ret.success
64+
assert ret.stdout
65+
66+
5267
def test_commit_merge_requests(gitlab_cli, project, merge_request, wait_for_sidekiq):
5368
"""This tests the `project-commit merge-requests` command and also tests
5469
that we can print the result using the `json` formatter"""

0 commit comments

Comments
 (0)