From 3f4a71d4e10a9722314b8edcbad01e554f3c3920 Mon Sep 17 00:00:00 2001 From: salimfadhley Date: Sat, 6 Jul 2013 00:07:03 +0100 Subject: [PATCH] Fix for issue #142 copy_job return value changed from destination job to source job --- jenkinsapi/jenkins.py | 2 +- jenkinsapi_tests/systests/test_jenkins.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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() -- 2.34.1