Pylint and (hopefully) Jenkins test fix.

This commit is contained in:
Mike Place 2014-05-06 10:21:53 -06:00
parent e6e0eec532
commit 469989092d

View File

@ -62,7 +62,7 @@ class LoadAuthTestCase(TestCase):
self.lauth.get_groups(valid_eauth_load) self.lauth.get_groups(valid_eauth_load)
format_call_mock.assert_has_calls(expected_ret) format_call_mock.assert_has_calls(expected_ret)
@patch('salt.utils.verify.check_path_traversal')
@patch('salt.utils.event.tagify', return_value=[]) @patch('salt.utils.event.tagify', return_value=[])
@patch('salt.utils.event.SaltEvent.fire_event', return_value='dummy_tag') @patch('salt.utils.event.SaltEvent.fire_event', return_value='dummy_tag')
@patch('salt.auth.LoadAuth.time_auth', return_value=True) @patch('salt.auth.LoadAuth.time_auth', return_value=True)
@ -77,13 +77,13 @@ class MasterAuthTestCase(TestCase):
'default_include': '', 'default_include': '',
'extension_modules': '', 'extension_modules': '',
'client_acl_blacklist': {}, 'client_acl_blacklist': {},
'external_auth': {'pam': {'test_user': [{'*': ['test.ping']}], 'test_group%': [{'*': ['test.echo']}]}}, 'external_auth': {'pam': {'test_user': [{'*': ['test.ping']}], 'test_group%': [{'*': ['test.echo']}]}},
'master_job_cache': '', 'master_job_cache': '',
}, },
None, None, None) None, None, None)
def test_master_publish_name(self, ck_minions_mock, time_auth_mock, fire_event_mock, tagify_mock): def test_master_publish_name(self, ck_minions_mock, time_auth_mock, fire_event_mock, tagify_mock, check_path_mock):
''' '''
Test to ensure a simple name can auth against a given function Test to ensure a simple name can auth against a given function
''' '''