From fd01e9e9165a489f21e4dd93cce22a4bac78eb59 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sat, 17 Sep 2016 21:02:52 -0400 Subject: [PATCH] Fix confirm() util true state The confirm() util incorrectly returns true only when the answer is false. This patch reverses the logic so that it properly returns true when the user inputs a true statement. Include test case for delete-all command usage to accept or abort. Mocking the input builtin ensures that the behaviour resulting from the user inputting 'y' or 'n' will remain tested for delete-all. Change-Id: I742804a8efe7da8ca6aa70f20059d02758910deb Co-Authored-By: Darragh Bailey Signed-off-by: Thanh Ha --- jenkins_jobs/utils.py | 2 +- tests/cmd/subcommands/test_delete_all.py | 53 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tests/cmd/subcommands/test_delete_all.py diff --git a/jenkins_jobs/utils.py b/jenkins_jobs/utils.py index 7b4a08861..4e28ad25d 100644 --- a/jenkins_jobs/utils.py +++ b/jenkins_jobs/utils.py @@ -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' diff --git a/tests/cmd/subcommands/test_delete_all.py b/tests/cmd/subcommands/test_delete_all.py new file mode 100644 index 000000000..15fc23dda --- /dev/null +++ b/tests/cmd/subcommands/test_delete_all.py @@ -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)