jjb/jenkins-job-builder
Code Issues Proposed changes

user's input should not be interpreted

Browse Source 
using python's "input" rather than "raw_input" raise exception
since the user's input is interpreted.
In python 3.x raw_input = input, so the interpertation bug
only exists in python 2.x

Change-Id: I28781a8742d6e03bc850fd0178f317474603a9d2
This commit is contained in:
Isaac Beckman 2016-10-13 16:29:51 +03:00
parent a65c799a9e
commit 4b63891dd7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jenkins_jobs/utils.py
View File

@ -19,6 +19,7 @@ import codecs
import fnmatch import fnmatch
import locale import locale
import os.path import os.path
from six.moves import input
def wrap_stream(stream, encoding='utf-8'): def wrap_stream(stream, encoding='utf-8'):

8
tests/cmd/subcommands/test_delete_all.py
View File

@ -17,8 +17,6 @@
# of actions by the JJB library, usually through interaction with the # of actions by the JJB library, usually through interaction with the
# python-jenkins library. # python-jenkins library.
import six
from tests.base import mock from tests.base import mock
from tests.cmd.test_cmd import CmdTestsBase from tests.cmd.test_cmd import CmdTestsBase
@ -27,8 +25,6 @@ from tests.cmd.test_cmd import CmdTestsBase
mock.MagicMock) mock.MagicMock)
class DeleteAllTests(CmdTestsBase): class DeleteAllTests(CmdTestsBase):
input_module = "jenkins_jobs.utils" if six.PY2 else "builtins"
@mock.patch('jenkins_jobs.cli.subcommand.update.' @mock.patch('jenkins_jobs.cli.subcommand.update.'
'JenkinsManager.delete_all_jobs') 'JenkinsManager.delete_all_jobs')
def test_delete_all_accept(self, delete_job_mock): def test_delete_all_accept(self, delete_job_mock):
@ -37,7 +33,7 @@ class DeleteAllTests(CmdTestsBase):
""" """
args = ['--conf', self.default_config_file, 'delete-all'] args = ['--conf', self.default_config_file, 'delete-all']
with mock.patch('%s.input' % self.input_module, return_value="y"): with mock.patch('jenkins_jobs.utils.input', return_value="y"):
self.execute_jenkins_jobs_with_args(args) self.execute_jenkins_jobs_with_args(args)
@mock.patch('jenkins_jobs.cli.subcommand.update.' @mock.patch('jenkins_jobs.cli.subcommand.update.'
@ -48,6 +44,6 @@ class DeleteAllTests(CmdTestsBase):
""" """
args = ['--conf', self.default_config_file, 'delete-all'] args = ['--conf', self.default_config_file, 'delete-all']
with mock.patch('%s.input' % self.input_module, return_value="n"): with mock.patch('jenkins_jobs.utils.input', return_value="n"):
self.assertRaises(SystemExit, self.assertRaises(SystemExit,
self.execute_jenkins_jobs_with_args, args) self.execute_jenkins_jobs_with_args, args)