From c051dd85021da732e774f7a7e4bce1e5ec26683e Mon Sep 17 00:00:00 2001 From: Truc Nguyen Date: Wed, 20 Sep 2017 15:46:19 +0200 Subject: [PATCH] Fixes delete-all command when no option is provided Change-Id: Ibc06209c2ec19045e12a145083a64a179d57d731 Implements: fix for delete-all command without option Closes-Bug: #2001207 --- jenkins_jobs/cli/subcommand/delete_all.py | 4 ++-- tests/cmd/subcommands/test_delete_all.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jenkins_jobs/cli/subcommand/delete_all.py b/jenkins_jobs/cli/subcommand/delete_all.py index 8886d26ac..af9ff2283 100644 --- a/jenkins_jobs/cli/subcommand/delete_all.py +++ b/jenkins_jobs/cli/subcommand/delete_all.py @@ -69,10 +69,10 @@ class DeleteAllSubCommand(base.BaseSubCommand): 'Job Builder)'.format(" AND ".join(reach))): sys.exit('Aborted') - if options.del_jobs: + if 'jobs' in reach: logger.info("Deleting all jobs") builder.delete_all_jobs() - if options.del_views: + if 'views' in reach: logger.info("Deleting all views") builder.delete_all_views() diff --git a/tests/cmd/subcommands/test_delete_all.py b/tests/cmd/subcommands/test_delete_all.py index 392649941..a8f6e0b49 100644 --- a/tests/cmd/subcommands/test_delete_all.py +++ b/tests/cmd/subcommands/test_delete_all.py @@ -33,8 +33,10 @@ class DeleteAllTests(CmdTestsBase): """ args = ['--conf', self.default_config_file, 'delete-all'] - with mock.patch('jenkins_jobs.utils.input', return_value="y"): - self.execute_jenkins_jobs_with_args(args) + with mock.patch('jenkins_jobs.builder.JenkinsManager.get_views', + return_value=[None]): + with mock.patch('jenkins_jobs.utils.input', return_value="y"): + self.execute_jenkins_jobs_with_args(args) @mock.patch('jenkins_jobs.cli.subcommand.update.' 'JenkinsManager.delete_all_jobs')