modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-12 02:46:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch to using gssapi_login for koji

Browse Source 
Fixes https://pagure.io/fm-orchestrator/issue/1777

koji recently dropped this old call
https://pagure.io/koji/pull-request/3599

Previously, koji was ignoring the ctx arg and wrapping gssapi_login,
so this change is completely equivalent to the old behavior.
This commit is contained in:
Mike McLean
2023-02-22 10:20:16 -05:00
parent c76f541bca
commit f6dcf6c346
6 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_builder/test_content_generator.py
View File

@@ -140,7 +140,7 @@ class TestBuild:
assert new_mmd.get_module_name().endswith("-devel")
# Ensure an anonymous Koji session works
koji_session.krb_login.assert_not_called()
koji_session.gssapi_login.assert_not_called()
@patch("koji.ClientSession")
@patch("subprocess.Popen")
@@ -187,7 +187,7 @@ class TestBuild:
assert expected_output == ret
# Anonymous koji session should work well.
koji_session.krb_login.assert_not_called()
koji_session.gssapi_login.assert_not_called()
def test_prepare_file_directory(self):
""" Test preparation of directory with output files """
@@ -221,7 +221,7 @@ class TestBuild:
koji_session.tagBuild.assert_called_once_with(123, "nginx-0-2.10e50d06")
# tagBuild requires logging into a session in advance.
koji_session.krb_login.assert_called_once()
koji_session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_tag_cg_build_fallback_to_default_tag(self, ClientSession):
@@ -239,7 +239,7 @@ class TestBuild:
koji_session.tagBuild.assert_called_once_with(123, "nginx-0-2.10e50d06")
# tagBuild requires logging into a session in advance.
koji_session.krb_login.assert_called_once()
koji_session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_tag_cg_build_no_tag_set(self, ClientSession):
@@ -253,7 +253,7 @@ class TestBuild:
koji_session.tagBuild.assert_not_called()
# tagBuild requires logging into a session in advance.
koji_session.krb_login.assert_called_once()
koji_session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_tag_cg_build_no_tag_available(self, ClientSession):
@@ -266,7 +266,7 @@ class TestBuild:
koji_session.tagBuild.assert_not_called()
# tagBuild requires logging into a session in advance.
koji_session.krb_login.assert_called_once()
koji_session.gssapi_login.assert_called_once()
@patch("module_build_service.builder.KojiContentGenerator.open", create=True)
def test_get_arch_mmd_output(self, patched_open):
@@ -425,7 +425,7 @@ class TestBuild:
assert rpm["license"] == "GPL"
# Listing tagged RPMs does not require to log into a session
koji_session.krb_login.assert_not_called()
koji_session.gssapi_login.assert_not_called()
@patch("koji.ClientSession")
def test_koji_rpms_in_tag_empty_tag(self, ClientSession):

14
tests/test_builder/test_koji.py
View File

@@ -447,7 +447,7 @@ class TestKojiBuilder:
assert session.getTaskDescendents.mock_calls == expected_calls
# getLoggedInUser requires to a logged-in session
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_get_build_weights_no_task_id(self, ClientSession):
@@ -468,7 +468,7 @@ class TestKojiBuilder:
expected_calls = [mock.call(456)]
assert session.getTaskDescendents.mock_calls == expected_calls
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_get_build_weights_no_build(self, ClientSession):
@@ -489,7 +489,7 @@ class TestKojiBuilder:
expected_calls = [mock.call(456)]
assert session.getTaskDescendents.mock_calls == expected_calls
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_get_build_weights_listBuilds_failed(self, ClientSession):
@@ -508,7 +508,7 @@ class TestKojiBuilder:
packageID=2, userID=123, state=1, queryOpts={"limit": 1, "order": "-build_id"}),
]
assert session.listBuilds.mock_calls == expected_calls
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_get_build_weights_getPackageID_failed(self, ClientSession):
@@ -523,7 +523,7 @@ class TestKojiBuilder:
expected_calls = [mock.call("httpd"), mock.call("apr")]
assert session.getPackageID.mock_calls == expected_calls
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_get_build_weights_getLoggedInUser_failed(self, ClientSession):
@@ -531,7 +531,7 @@ class TestKojiBuilder:
session.getAverageBuildDuration.return_value = None
weights = KojiModuleBuilder.get_build_weights(["httpd", "apr"])
assert weights == {"httpd": 1.5, "apr": 1.5}
session.krb_login.assert_called_once()
session.gssapi_login.assert_called_once()
@pytest.mark.parametrize("blocklist", [False, True])
@pytest.mark.parametrize("custom_whitelist", [False, True])
@@ -824,7 +824,7 @@ class TestKojiBuilder:
def test_ensure_builder_use_a_logged_in_koji_session(self, ClientSession):
module_build = module_build_service.common.models.ModuleBuild.get_by_id(db_session, 2)
builder = KojiModuleBuilder(db_session, "owner", module_build, conf, "module-tag", [])
builder.koji_session.krb_login.assert_called_once()
builder.koji_session.gssapi_login.assert_called_once()
@patch("koji.ClientSession")
def test_repo_from_tag(self, ClientSession):