From 66e2aa4d44740241bfc66285a2eb88c1606809a1 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jan 05 2018 13:08:37 +0000 Subject: Remove unused proxyuser variable from Koji service code. --- diff --git a/freshmaker/config.py b/freshmaker/config.py index 2205eb6..63e4660 100644 --- a/freshmaker/config.py +++ b/freshmaker/config.py @@ -176,18 +176,10 @@ class Config(object): 'type': str, 'default': 'koji', 'desc': 'Koji Profile from where to load Koji configuration.'}, - 'koji_proxyuser': { - 'type': bool, - 'default': True, - 'desc': 'Koji proxyuser flag.'}, 'koji_container_scratch_build': { 'type': bool, 'default': False, 'desc': 'Whether to make a scratch build to rebuild the image.'}, - 'koji_build_owner': { - 'type': str, - 'default': '', - 'desc': 'Build owner.'}, 'dry_run': { 'type': bool, 'default': False, diff --git a/freshmaker/kojiservice.py b/freshmaker/kojiservice.py index 540e9bd..44546f6 100644 --- a/freshmaker/kojiservice.py +++ b/freshmaker/kojiservice.py @@ -72,10 +72,10 @@ class KojiService(object): self.config) return self._session - def krb_login(self, proxyuser=None): + def krb_login(self): # No need to login on dry run, this makes dry run much faster. if not conf.dry_run: - self.session.krb_login(proxyuser=proxyuser) + self.session.krb_login() else: log.info("DRY RUN: Skipping login in dry run mode.") @@ -194,10 +194,8 @@ def koji_service(profile=None, logger=None, login=True): log.debug('Logging into %s with Kerberos authentication.', service.server) - proxyuser = conf.koji_build_owner if conf.koji_proxyuser else None - with krb_context(): - service.krb_login(proxyuser=proxyuser) + service.krb_login() # We are not logged in in dry run mode... if not conf.dry_run and not service.logged_in: diff --git a/tests/test_git_dockerfile_change_handler.py b/tests/test_git_dockerfile_change_handler.py index 6b14d7a..3dfe71e 100644 --- a/tests/test_git_dockerfile_change_handler.py +++ b/tests/test_git_dockerfile_change_handler.py @@ -89,7 +89,7 @@ class GitDockerfileChangeHandlerTest(BaseTestCase): # krb_login. krbContext.assert_called_once() - mock_session.krb_login.assert_called_once_with(proxyuser=None) + mock_session.krb_login.assert_called_once_with() mock_session.buildContainer.assert_called_once_with( 'git://pkgs.fedoraproject.org/container/testimage.git?#e1f39d43471fc37ec82616f76a119da4eddec787', 'rawhide-container-candidate',