jjb/python-jenkins
Code Issues Proposed changes

Merge "Fix item being ignored in get_info"

Browse Source
This commit is contained in:
Zuul 2018-08-13 14:10:04 +00:00 committed by Gerrit Code Review
commit 437d5de4e9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/__init__.py
View File

@ -771,7 +771,7 @@ class Jenkins(object):
url += query
try:
return json.loads(self.jenkins_open(
requests.Request('GET', self._build_url(INFO))
requests.Request('GET', self._build_url(url))
))
except (req_exc.HTTPError, BadStatusLine):
raise BadHTTPException("Error communicating with server[%s]"

2
tests/jobs/test_get.py
View File

@ -25,7 +25,7 @@ class JenkinsGetJobsTest(JenkinsGetJobsTestBase):
self.assertEqual(job_info, [jobs])
self.assertEqual(
jenkins_mock.call_args[0][0].url,
self.make_url('api/json'))
self.make_url('api/json?tree=jobs[url,color,name,jobs]'))
self._check_requests(jenkins_mock.call_args_list)
@patch.object(jenkins.Jenkins, 'jenkins_open')