jjb/python-jenkins
Code Issues Proposed changes

Merge "get_running_builds failed when server has a path"

Browse Source
This commit is contained in:
Jenkins 2016-11-14 16:10:56 +00:00 committed by Gerrit Code Review
commit 234aa6550c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/__init__.py
View File

@ -1149,7 +1149,7 @@ class Jenkins(object):
executor_number = executor['number'] executor_number = executor['number']
build_number = executable['number'] build_number = executable['number']
url = executable['url'] url = executable['url']
m = re.match(r'/job/([^/]+)/.*', urlparse(url).path) m = re.search(r'/job/([^/]+)/.*', urlparse(url).path)
job_name = m.group(1) job_name = m.group(1)
builds.append({'name': job_name, builds.append({'name': job_name,
'number': build_number, 'number': build_number,

8
tests/test_build.py
View File

@ -259,7 +259,7 @@ class JenkinsListRunningBuildsTest(JenkinsTestBase):
"number": 1, "number": 1,
"result": None, "result": None,
"timestamp": 1442262342729, "timestamp": 1442262342729,
"url": "https://localhost/job/test/1/", "url": self.make_url('job/test/1/'),
"builtOn": "", "builtOn": "",
"changeSet": { "changeSet": {
"items": [], "items": [],
@ -293,7 +293,7 @@ class JenkinsListRunningBuildsTest(JenkinsTestBase):
'number': 1, 'number': 1,
'node': '(master)', 'node': '(master)',
'executor': 1, 'executor': 1,
'url': 'https://localhost/job/test/1/'}], builds) 'url': self.make_url('job/test/1/')}], builds)
@patch.object(jenkins.Jenkins, 'get_node_info') @patch.object(jenkins.Jenkins, 'get_node_info')
@patch.object(jenkins.Jenkins, 'get_nodes') @patch.object(jenkins.Jenkins, 'get_nodes')
@ -338,7 +338,7 @@ class JenkinsListRunningBuildsTest(JenkinsTestBase):
"number": 15, "number": 15,
"result": None, "result": None,
"timestamp": 1442262342729, "timestamp": 1442262342729,
"url": "https://localhost/job/test/15/", "url": self.make_url("job/test/15/"),
"builtOn": "", "builtOn": "",
"changeSet": { "changeSet": {
"items": [], "items": [],
@ -372,7 +372,7 @@ class JenkinsListRunningBuildsTest(JenkinsTestBase):
'number': 15, 'number': 15,
'node': 'foo-slave', 'node': 'foo-slave',
'executor': 0, 'executor': 0,
'url': 'https://localhost/job/test/15/'}], builds) 'url': self.make_url('job/test/15/')}], builds)
@patch.object(jenkins.Jenkins, 'get_node_info') @patch.object(jenkins.Jenkins, 'get_node_info')
@patch.object(jenkins.Jenkins, 'get_nodes') @patch.object(jenkins.Jenkins, 'get_nodes')