diff --git a/jenkins/__init__.py b/jenkins/__init__.py index e411c31..9a0bd52 100755 --- a/jenkins/__init__.py +++ b/jenkins/__init__.py @@ -830,7 +830,7 @@ class Jenkins(object): """Get information on this Master or item on Master. This information includes job list and view information and can be - used to retreive information on items such as job folders. + used to retrieve information on items such as job folders. :param item: item to get information about on this Master :param query: xpath to extract information about on this Master @@ -2110,7 +2110,7 @@ class Jenkins(object): :param exception_message: Message to use for the exception. Formatted with ``name``, ``domain_name``, and ``folder_name`` - :throws: :class:`JenkinsException` whenever the credentail + :throws: :class:`JenkinsException` whenever the credential does not exist in domain of folder ''' if not self.credential_exists(name, folder_name, domain_name): @@ -2118,12 +2118,12 @@ class Jenkins(object): % (name, domain_name, folder_name)) def credential_exists(self, name, folder_name, domain_name='_'): - '''Check whether a credentail exists in domain of folder + '''Check whether a credential exists in domain of folder - :param name: Name of credentail, ``str`` + :param name: Name of credential, ``str`` :param folder_name: Folder name, ``str`` :param domain_name: Domain name, default is '_', ``str`` - :returns: ``True`` if credentail exists, ``False`` otherwise + :returns: ``True`` if credential exists, ``False`` otherwise ''' try: return self.get_credential_info(name, folder_name, @@ -2134,7 +2134,7 @@ class Jenkins(object): def get_credential_info(self, name, folder_name, domain_name='_'): '''Get credential information dictionary in domain of folder - :param name: Name of credentail, ``str`` + :param name: Name of credential, ``str`` :param folder_name: folder_name, ``str`` :param domain_name: Domain name, default is '_', ``str`` :returns: Dictionary of credential info, ``dict`` @@ -2165,7 +2165,7 @@ class Jenkins(object): def get_credential_config(self, name, folder_name, domain_name='_'): '''Get configuration of credential in domain of folder. - :param name: Name of credentail, ``str`` + :param name: Name of credential, ``str`` :param folder_name: Folder name, ``str`` :param domain_name: Domain name, default is '_', ``str`` :returns: Credential configuration (XML format) @@ -2178,7 +2178,7 @@ class Jenkins(object): def create_credential(self, folder_name, config_xml, domain_name='_'): - '''Create credentail in domain of folder + '''Create credential in domain of folder :param folder_name: Folder name, ``str`` :param config_xml: New XML configuration, ``str`` @@ -2203,7 +2203,7 @@ class Jenkins(object): def delete_credential(self, name, folder_name, domain_name='_'): '''Delete credential from domain of folder - :param name: Name of credentail, ``str`` + :param name: Name of credential, ``str`` :param folder_name: Folder name, ``str`` :param domain_name: Domain name, default is '_', ``str`` ''' diff --git a/tests/jobs/test_build.py b/tests/jobs/test_build.py index ba495c6..0efd503 100644 --- a/tests/jobs/test_build.py +++ b/tests/jobs/test_build.py @@ -34,7 +34,7 @@ class JenkinsBuildJobTest(JenkinsJobsTestBase): @patch.object(jenkins.Jenkins, 'maybe_add_crumb') @patch('jenkins.requests.Session.send', autospec=True) - def test_simple_no_content_lenght(self, session_send_mock, + def test_simple_no_content_length(self, session_send_mock, maybe_add_crumb_mock): maybe_add_crumb_mock.return_value = None session_send_mock.return_value = build_response_mock( @@ -49,7 +49,7 @@ class JenkinsBuildJobTest(JenkinsJobsTestBase): @patch.object(jenkins.Jenkins, 'maybe_add_crumb') @patch('jenkins.requests.Session.send', autospec=True) - def test_assert_no_content_lenght_no_location(self, session_send_mock, + def test_assert_no_content_length_no_location(self, session_send_mock, maybe_add_crumb_mock): maybe_add_crumb_mock.return_value = None session_send_mock.return_value = build_response_mock( diff --git a/tests/test_credential.py b/tests/test_credential.py index 8e7418b..1338356 100644 --- a/tests/test_credential.py +++ b/tests/test_credential.py @@ -84,11 +84,11 @@ class JenkinsAssertCredentialTest(JenkinsCredentialTestBase): ] with self.assertRaises(jenkins.JenkinsException) as context_manager: - self.j.assert_credential_exists('NonExistent', 'TestFoler') + self.j.assert_credential_exists('NonExistent', 'TestFolder') self.assertEqual( str(context_manager.exception), 'credential[NonExistent] does not exist' - ' in the domain[_] of [TestFoler]') + ' in the domain[_] of [TestFolder]') self._check_requests(jenkins_mock.call_args_list) @patch.object(jenkins.Jenkins, 'jenkins_open') @@ -97,7 +97,7 @@ class JenkinsAssertCredentialTest(JenkinsCredentialTestBase): json.dumps({'_class': 'com.cloudbees.hudson.plugins.folder.Folder'}), json.dumps({'id': 'ExistingCredential'}) ] - self.j.assert_credential_exists('ExistingCredential', 'TestFoler') + self.j.assert_credential_exists('ExistingCredential', 'TestFolder') self._check_requests(jenkins_mock.call_args_list)