jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "ListSubCommand: return job fullname"

This commit is contained in:
Zuul 2022-05-08 01:38:41 +00:00 committed by Gerrit Code Review
parent c0a1790228 f6556f5636
commit 31cf2ab234
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins_jobs/cli/subcommand/list.py
View File

@ -58,9 +58,9 @@ class ListSubCommand(base.BaseSubCommand):
jobs = [j["name"] for j in p.jobs]
else:
jobs = [
j["name"]
j["fullname"]
for j in self.jenkins.get_jobs()
if not jobs_glob or parser.matches(j["name"], jobs_glob)
if not jobs_glob or parser.matches(j["fullname"], jobs_glob)
]
jobs = sorted(jobs)

10
tests/cmd/subcommands/test_list.py
View File

@ -27,6 +27,14 @@ class ListFromJenkinsTests(TestWithScenarios, CmdTestsBase):
scenarios = [
("single", dict(jobs=["job1"], globs=[], found=["job1"])),
("multiple", dict(jobs=["job1", "job2"], globs=[], found=["job1", "job2"])),
(
"multiple_with_folder",
dict(
jobs=["folder1", "folder1/job1", "folder1/job2"],
globs=[],
found=["folder1", "folder1/job1", "folder1/job2"]
)
),
(
"multiple_with_glob",
dict(
@ -48,7 +56,7 @@ class ListFromJenkinsTests(TestWithScenarios, CmdTestsBase):
@mock.patch("jenkins_jobs.builder.JenkinsManager.get_jobs")
def test_list(self, get_jobs_mock):
def _get_jobs():
return [{"name": name} for name in self.jobs]
return [{"fullname": fullname} for fullname in self.jobs]
get_jobs_mock.side_effect = _get_jobs
console_out = io.BytesIO()