diff options
author | Salim Fadhley <sal@stodge.org> | 2014-08-02 16:09:55 +0100 |
---|---|---|
committer | Salim Fadhley <sal@stodge.org> | 2014-08-02 16:09:55 +0100 |
commit | ffcaac777b7fb95426d405e3ffda663d1ff42c47 (patch) | |
tree | cf40ee4e01037910f969ad2b137e5b7b77fb8a8c /jenkinsapi | |
parent | a4c3fab827673da3c70e834ffd4d362f24190de1 (diff) | |
download | python-jenkinsapi-ffcaac777b7fb95426d405e3ffda663d1ff42c47.tar.gz python-jenkinsapi-ffcaac777b7fb95426d405e3ffda663d1ff42c47.tar.bz2 python-jenkinsapi-ffcaac777b7fb95426d405e3ffda663d1ff42c47.zip |
fix a bunch of tests
Diffstat (limited to 'jenkinsapi')
-rw-r--r-- | jenkinsapi/queue.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/jenkinsapi/queue.py b/jenkinsapi/queue.py index 967ccf0..388697c 100644 --- a/jenkinsapi/queue.py +++ b/jenkinsapi/queue.py @@ -60,15 +60,17 @@ class Queue(JenkinsBase): else: raise UnknownQueueItem(item_id) - def get_queue_items_for_job(self, job_name=''): - if not job_name: - return [QueueItem(self.jenkins, **item) - for item in self._data['items']] - else: - return [QueueItem(self.jenkins, **item) - for item in self._data['items'] - if item['task']['name'] == job_name] - + def _get_queue_items_for_job(self, job_name): + for item in self._data["items"]: + if item['task']['name'] == job_name: + yield QueueItem(self.get_queue_item_url(item), jenkins_obj=self.jenkins) + + def get_queue_items_for_job(self, job_name): + return list(self._get_queue_items_for_job(job_name)) + + def get_queue_item_url(self, item): + return "%s/item/%i" % (self.baseurl, item["id"]) + def delete_item(self, queue_item): self.delete_item_by_id(queue_item.id) @@ -97,11 +99,11 @@ class QueueItem(JenkinsBase): """ Return the job associated with this queue item """ - return self.jenkins[self.task['name']] + return self.jenkins[self._data['task']['name']] def get_parameters(self): """returns parameters of queue item""" - actions = getattr(self, 'actions', []) + actions = self._data.get('actions', []) for action in actions: if type(action) is dict and 'parameters' in action: parameters = action['parameters'] |