From: salimfadhley Date: Fri, 5 Jul 2013 23:07:03 +0000 (+0100) Subject: Fix for issue #142 copy_job return value changed from destination job to source job X-Git-Tag: v0.2.23~116^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f4a71d4e10a9722314b8edcbad01e554f3c3920;p=tools%2Fpython-jenkinsapi.git Fix for issue #142 copy_job return value changed from destination job to source job --- diff --git a/jenkinsapi/jenkins.py b/jenkinsapi/jenkins.py index 392bd40..cdea1e8 100644 --- a/jenkinsapi/jenkins.py +++ b/jenkinsapi/jenkins.py @@ -145,7 +145,7 @@ class Jenkins(JenkinsBase): params=params, data='') self.poll() - return self[jobname] + return self[newjobname] def build_job(self, jobname, params={}): """ diff --git a/jenkinsapi_tests/systests/test_jenkins.py b/jenkinsapi_tests/systests/test_jenkins.py index af7be3b..2f04621 100644 --- a/jenkinsapi_tests/systests/test_jenkins.py +++ b/jenkinsapi_tests/systests/test_jenkins.py @@ -2,6 +2,7 @@ System tests for `jenkinsapi.jenkins` module. ''' import unittest +from jenkinsapi.job import Job from jenkinsapi.invocation import Invocation from jenkinsapi_tests.systests.base import BaseSystemTest from jenkinsapi_tests.systests.job_configs import EMPTY_JOB @@ -79,9 +80,11 @@ class JobTests(BaseSystemTest): copied_job_name = 'CPY%s' % random_string() self._create_job(template_job_name) - self.jenkins.copy_job(template_job_name, copied_job_name) + j = self.jenkins.copy_job(template_job_name, copied_job_name) self.assertJobIsPresent(template_job_name) self.assertJobIsPresent(copied_job_name) + self.assertIsInstance(j, Job) + self.assertEquals(j.name, copied_job_name) if __name__ == '__main__': unittest.main()