Skip to content

Commit 0228766

Browse files
committed
fix tests
1 parent 87edf14 commit 0228766

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

jenkins_cli/cli.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
}
4545

4646

47-
def get_formated_status(job_color, format_pattern="%(color)s%(symbol)s%(run_status)s%(endcollor)s", extra_params={}):
47+
def get_formated_status(job_color, format_pattern="%(color)s%(symbol)s%(run_status)s%(endcollor)s", extra_params=None):
48+
if not extra_params:
49+
extra_params = {}
4850
color_status = job_color.split('_')
4951
color = color_status[0]
5052
run_status = color_status[1] if len(color_status) == 2 else None
@@ -194,7 +196,7 @@ def setbranch(self, args):
194196
job_name = self._check_job(args.job_name)
195197
xml = self.jenkins.get_job_config(job_name)
196198
root = ElementTree.fromstring(xml.encode('utf-8'))
197-
scm_name, branch_node = self._get_scm_name_and_node(root)
199+
_, branch_node = self._get_scm_name_and_node(root)
198200
if branch_node is not None:
199201
branch_node.text = args.branch_name
200202
new_xml = xml_to_string(root)

tests/test_cli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def test_get_scm_name_and_node(self):
191191

192192
root = ElementTree.fromstring(EMPTY_SCM_XML.encode('utf-8'))
193193
name, branch_node = JenkinsCli(self.args)._get_scm_name_and_node(root)
194-
self.assertEqual(name, 'UnknownSCM')
194+
self.assertEqual(name, 'UnknownVCS')
195195
self.assertEqual(branch_node, None)
196196

197197
@mock.patch.object(jenkins.Jenkins, 'get_job_config')
@@ -202,7 +202,7 @@ def test_info(self, patched_get_job_name, patched_get_job_info, patched_get_job_
202202
patched_get_job_info.return_value = {}
203203
patched_get_job_config.return_value = EMPTY_SCM_XML
204204
JenkinsCli(self.args).info(self.args)
205-
arg = JenkinsCli.INFO_TEMPLATE % ('Not Built', 'Not Built', 'Not Built', 'Not Built', 'No', 'UnknownSCM', 'Unknown branch')
205+
arg = JenkinsCli.INFO_TEMPLATE % ('Not Built', 'Not Built', 'Not Built', 'Not Built', 'No', 'UnknownVCS', 'Unknown branch')
206206
self.patched_print.assert_called_once_with(arg)
207207
self.patched_print.reset_mock()
208208

@@ -234,7 +234,7 @@ def test_setbranch(self, patched_get_job_name, patched_get_job_config, patched_r
234234
self.args.branch_name = 'b1'
235235
JenkinsCli(self.args).setbranch(self.args)
236236
self.assertFalse(patched_reconfig_job.called)
237-
self.patched_print.assert_called_once_with("Can't set branch name")
237+
self.patched_print.assert_called_once_with("Cannot set branch name")
238238
self.patched_print.reset_mock()
239239

240240
patched_get_job_config.return_value = GIT_SCM_XML
@@ -289,7 +289,7 @@ def test_building(self, patched_job_name, patched_job_info, patched_build_info,
289289
JenkinsCli(self.args).building(self.args)
290290
self.assertFalse(patched_job_info.called)
291291
self.assertFalse(patched_build_info.called)
292-
self.patched_print.assert_called_once_with("Nothing is building now")
292+
self.patched_print.assert_called_once_with("Nothing is being built now")
293293
self.patched_print.reset_mock()
294294

295295
get_jobs_patched.return_value = [{'name': 'Job1', 'color': 'blue_anime'},

0 commit comments

Comments
 (0)