From 9cceac4ee1cc8a9a9070cbf72d8f73820f40682d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Apr 24 2023 13:17:17 +0000 Subject: koji upstream has deprecated krb5_login in favor of gssapi_login Change the call here and update the tests to the new call. Signed-off-by: Kevin Fenzi --- diff --git a/robosignatory/tag.py b/robosignatory/tag.py index 5fd1a2a..7d91745 100644 --- a/robosignatory/tag.py +++ b/robosignatory/tag.py @@ -42,7 +42,7 @@ class TagSigner(object): if six.PY2: value = value.encode("utf-8") kwargs[opt] = value - client.krb_login(**kwargs) + client.gssapi_login(**kwargs) else: raise Exception('Only SSL and kerberos authmethods supported') diff --git a/tests/test_tag.py b/tests/test_tag.py index 604ca54..995d2e9 100644 --- a/tests/test_tag.py +++ b/tests/test_tag.py @@ -216,7 +216,7 @@ class TestTagSigner(object): assert self.instance_obj['mbs_user'] == 'mbs_user' - self.koji_client.krb_login.assert_called_once_with( + self.koji_client.gssapi_login.assert_called_once_with( principal='test@EXAMPLE.COM') self.koji_client.ssl_login.assert_not_called() @@ -232,7 +232,7 @@ class TestTagSigner(object): self.koji_client.ssl_login.assert_called_once_with( 'cert', None, 'serverca') - self.koji_client.krb_login.assert_not_called() + self.koji_client.gssapi_login.assert_not_called() def test_init_with_unknown_authmethod(self): """Test that unknown authmethods are caught""" @@ -249,7 +249,7 @@ class TestTagSigner(object): self.tag_signer = TagSigner(test_config) koji_client.ssl_login.assert_not_called() - koji_client.krb_login.assert_not_called() + koji_client.gssapi_login.assert_not_called() def test_init_with_duplicate_from_tag(self): """Test behavior with duplicate from tag""" @@ -498,9 +498,9 @@ class TestTagSigner(object): assert not isinstance(value, unicode) @mark.skipif(not six.PY2, reason="only relevant on Python 2") - def test_py2_krb_login_args(self): - assert self.instance_obj["client"].krb_login.call_count == 1 + def test_py2_gssapi_login_args(self): + assert self.instance_obj["client"].gssapi_login.call_count == 1 assert not isinstance( - self.instance_obj["client"].krb_login.call_args_list[0][1]["principal"], + self.instance_obj["client"].gssapi_login.call_args_list[0][1]["principal"], unicode )