jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "fix delete job command and add tests"

Browse Source
This commit is contained in:
Jenkins 2014-10-29 18:41:04 +00:00 committed by Gerrit Code Review
commit 0c7e623f6f
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins_jobs/cmd.py
View File

@ -193,7 +193,7 @@ def execute(options, config):
ignore_cache=ignore_cache,
flush_cache=options.flush_cache)
if hasattr(options, 'path'):
if getattr(options, 'path', None):
if options.path == sys.stdin:
logger.debug("Input file is stdin")
if options.path.isatty():

22
tests/cmd/test_cmd.py
View File

@ -208,3 +208,25 @@ class CmdTests(testtools.TestCase):
cmd.execute(args, config) # probably better to fail here
update_job_mock.assert_called_with(paths, [], output=args.output_dir)
@mock.patch('jenkins_jobs.cmd.Builder.delete_job')
def test_delete_single_job(self, delete_job_mock):
"""
Test handling the deletion of a single Jenkins job.
"""
args = self.parser.parse_args(['delete', 'test_job'])
config = configparser.ConfigParser()
config.readfp(StringIO(cmd.DEFAULT_CONF))
cmd.execute(args, config) # passes if executed without error
@mock.patch('jenkins_jobs.cmd.Builder.delete_job')
def test_delete_multiple_jobs(self, delete_job_mock):
"""
Test handling the deletion of multiple Jenkins jobs.
"""
args = self.parser.parse_args(['delete', 'test_job1', 'test_job2'])
config = configparser.ConfigParser()
config.readfp(StringIO(cmd.DEFAULT_CONF))
cmd.execute(args, config) # passes if executed without error