particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use requests_gssapi instead of requests_kerberos

Browse source 
Retain ability to use the old requests_kerberos where request_gssapi is
not available yet.

Signed-off-by: Simo Sorce <simo@redhat.com>
This commit is contained in:
Simo Sorce 2020-05-22 10:56:59 -04:00 • committed by Mike McLean
parent 9063f33b07
commit 2c663f0b73
7 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_lib/test_gssapi.py
View file

@ -21,7 +21,7 @@ class TestGSSAPI(unittest.TestCase):
maxDiff = None
@mock.patch('koji.requests_kerberos', new=None)
@mock.patch('koji.reqgssapi', new=None)
def test_gssapi_disabled(self):
with self.assertRaises(ImportError):
self.session.gssapi_login()
@ -33,13 +33,13 @@ class TestGSSAPI(unittest.TestCase):
retry=False)
self.assertEqual(old_environ, dict(**os.environ))
@mock.patch('requests_kerberos.HTTPKerberosAuth')
@mock.patch('koji.reqgssapi.HTTPKerberosAuth')
def test_gssapi_login_keytab(self, HTTPKerberosAuth_mock):
principal = 'user@EXAMPLE.COM'
keytab = '/path/to/keytab'
ccache = '/path/to/cache'
old_environ = dict(**os.environ)
current_version = koji.requests_kerberos.__version__
current_version = koji.reqgssapi.__version__
accepted_versions = ['0.12.0.beta1',
'0.12.0dev',
'0.12.0a1',
@ -47,7 +47,7 @@ class TestGSSAPI(unittest.TestCase):
'0.10.0',
'0.9.0']
for accepted_version in accepted_versions:
koji.requests_kerberos.__version__ = accepted_version
koji.reqgssapi.__version__ = accepted_version
rv = self.session.gssapi_login(principal, keytab, ccache)
self.session._callMethod.assert_called_once_with('sslLogin',
[None],
@ -55,14 +55,14 @@ class TestGSSAPI(unittest.TestCase):
self.assertEqual(old_environ, dict(**os.environ))
self.assertTrue(rv)
self.session._callMethod.reset_mock()
koji.requests_kerberos.__version__ = current_version
koji.reqgssapi.__version__ = current_version
def test_gssapi_login_keytab_unsupported_requests_kerberos_version(self):
def test_gssapi_login_keytab_unsupported_requests_kerberos(self):
principal = 'user@EXAMPLE.COM'
keytab = '/path/to/keytab'
ccache = '/path/to/cache'
old_environ = dict(**os.environ)
current_version = koji.requests_kerberos.__version__
current_version = koji.reqgssapi.__version__
old_versions = ['0.8.0',
'0.7.0',
'0.6.1',
@ -72,15 +72,15 @@ class TestGSSAPI(unittest.TestCase):
'0.2',
'0.1']
for old_version in old_versions:
koji.requests_kerberos.__version__ = old_version
koji.reqgssapi.__version__ = old_version
with self.assertRaises(koji.PythonImportError) as cm:
self.session.gssapi_login(principal, keytab, ccache)
self.assertEqual(cm.exception.args[0],
'python-requests-kerberos >= 0.9.0 required for '
'python-requests-gssapi >= 0.9.0 required for '
'keytab auth')
self.session._callMethod.assert_not_called()
self.assertEqual(old_environ, dict(**os.environ))
koji.requests_kerberos.__version__ = current_version
koji.reqgssapi.__version__ = current_version
def test_gssapi_login_error(self):
old_environ = dict(**os.environ)