Merge "Fix confirm() util true state"

This commit is contained in:
Jenkins 2016-09-30 16:32:46 +00:00 committed by Gerrit Code Review
commit 02ae9dc8ed
2 changed files with 54 additions and 1 deletions

View File

@ -66,4 +66,4 @@ def recurse_path(root, excludes=None):
def confirm(question):
answer = input('%s (Y/N): ' % question).upper().strip()
return not answer == 'Y'
return answer == 'Y'

View File

@ -0,0 +1,53 @@
# - Copyright 2016 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# The goal of these tests is to check that given a particular set of flags to
# Jenkins Job Builder's command line tools it will result in a particular set
# of actions by the JJB library, usually through interaction with the
# python-jenkins library.
import six
from tests.base import mock
from tests.cmd.test_cmd import CmdTestsBase
@mock.patch('jenkins_jobs.builder.JenkinsManager.get_plugins_info',
mock.MagicMock)
class DeleteAllTests(CmdTestsBase):
input_module = "jenkins_jobs.utils" if six.PY2 else "builtins"
@mock.patch('jenkins_jobs.cli.subcommand.update.'
'JenkinsManager.delete_all_jobs')
def test_delete_all_accept(self, delete_job_mock):
"""
Test handling the deletion of a single Jenkins job.
"""
args = ['--conf', self.default_config_file, 'delete-all']
with mock.patch('%s.input' % self.input_module, return_value="y"):
self.execute_jenkins_jobs_with_args(args)
@mock.patch('jenkins_jobs.cli.subcommand.update.'
'JenkinsManager.delete_all_jobs')
def test_delete_all_abort(self, delete_job_mock):
"""
Test handling the deletion of a single Jenkins job.
"""
args = ['--conf', self.default_config_file, 'delete-all']
with mock.patch('%s.input' % self.input_module, return_value="n"):
self.assertRaises(SystemExit,
self.execute_jenkins_jobs_with_args, args)