jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "change assert(Not)Equals to assert(Not)Equal"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 14:47:58 +00:00 committed by Gerrit Code Review
commit eff67d90f7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cmd/subcommands/test_update.py
View File

@ -114,7 +114,7 @@ class UpdateTests(CmdTestsBase):
jenkins_delete_job.assert_has_calls(calls) jenkins_delete_job.assert_has_calls(calls)
# to ensure only the calls we expected were made, have to check # to ensure only the calls we expected were made, have to check
# there were no others, as no API call for assert_has_only_calls # there were no others, as no API call for assert_has_only_calls
self.assertEquals(jenkins_delete_job.call_count, len(calls)) self.assertEqual(jenkins_delete_job.call_count, len(calls))
def test_update_timeout_not_set(self): def test_update_timeout_not_set(self):
"""Validate update timeout behavior when timeout not explicitly configured. """Validate update timeout behavior when timeout not explicitly configured.

4
tests/cmd/test_config.py
View File

@ -130,7 +130,7 @@ class TestConfigs(CmdTestsBase):
# contains the expected timeout value. # contains the expected timeout value.
jjb_config = jenkins_mock.call_args[0][0] jjb_config = jenkins_mock.call_args[0][0]
self.assertEquals(jjb_config.jenkins['timeout'], self.assertEqual(jjb_config.jenkins['timeout'],
builder._DEFAULT_TIMEOUT) builder._DEFAULT_TIMEOUT)
@mock.patch('jenkins_jobs.cli.subcommand.update.JenkinsManager') @mock.patch('jenkins_jobs.cli.subcommand.update.JenkinsManager')
@ -154,4 +154,4 @@ class TestConfigs(CmdTestsBase):
# contains the expected timeout value. # contains the expected timeout value.
jjb_config = jenkins_mock.call_args[0][0] jjb_config = jenkins_mock.call_args[0][0]
self.assertEquals(jjb_config.jenkins['timeout'], 0.2) self.assertEqual(jjb_config.jenkins['timeout'], 0.2)

2
tests/jenkins_manager/test_manager.py
View File

@ -67,7 +67,7 @@ class TestCaseTestJenkinsManager(base.BaseTestCase):
patches['is_managed'].side_effect = [True, True] patches['is_managed'].side_effect = [True, True]
self.builder.delete_old_managed() self.builder.delete_old_managed()
self.assertEquals(patches['delete_job'].call_count, 2) self.assertEqual(patches['delete_job'].call_count, 2)
def _get_plugins_info_error_test(self, error_string): def _get_plugins_info_error_test(self, error_string):
builder = jenkins_jobs.builder.JenkinsManager(self.jjb_config) builder = jenkins_jobs.builder.JenkinsManager(self.jjb_config)