From 31ec1835dbba88a21c459d128c5c656ff43f19df Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 4 Oct 2016 12:38:10 +0200 Subject: [PATCH] rename method to KojiModuleBuilder.get_session() KojiModuleBuilder.get_session_from_config() will require the owner as an argument, therefore drop encoding arguments in the method name. --- rida/builder.py | 4 ++-- rida/scheduler/main.py | 3 +-- tests/test_scheduler/test_repo_done.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rida/builder.py b/rida/builder.py index 8809911c..7e6f4ab1 100644 --- a/rida/builder.py +++ b/rida/builder.py @@ -261,7 +261,7 @@ class KojiModuleBuilder(GenericBuilder): log.debug("Using koji profile %r" % config.koji_profile) log.debug("Using koji_config: %s" % config.koji_config) - self.koji_session = self.get_session_from_config(config) + self.koji_session = self.get_session(config) self.arches = config.koji_arches if not self.arches: raise ValueError("No koji_arches specified in the config.") @@ -364,7 +364,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules return srpm_paths[0] @staticmethod - def get_session_from_config(config): + def get_session(config): koji_config = munch.Munch(koji.read_config( profile_name=config.koji_profile, user_config=config.koji_config, diff --git a/rida/scheduler/main.py b/rida/scheduler/main.py index cb34f425..0bf92eaa 100644 --- a/rida/scheduler/main.py +++ b/rida/scheduler/main.py @@ -185,8 +185,7 @@ class Poller(threading.Thread): # TODO re-use if conf.system == "koji": - koji_session = ( - rida.builder.KojiModuleBuilder.get_session_from_config(conf)) + koji_session = rida.builder.KojiModuleBuilder.get_session(conf) log.info("Querying tasks for statuses:") res = models.ComponentBuild.query.filter_by(state=koji.BUILD_STATES['BUILDING']).all() diff --git a/tests/test_scheduler/test_repo_done.py b/tests/test_scheduler/test_repo_done.py index 1de319b7..ad46ab45 100644 --- a/tests/test_scheduler/test_repo_done.py +++ b/tests/test_scheduler/test_repo_done.py @@ -49,7 +49,7 @@ class TestRepoDone(unittest.TestCase): self.fn(config=self.config, session=self.session, msg=msg) @mock.patch('rida.builder.KojiModuleBuilder.buildroot_ready') - @mock.patch('rida.builder.KojiModuleBuilder.get_session_from_config') + @mock.patch('rida.builder.KojiModuleBuilder.get_session') @mock.patch('rida.builder.KojiModuleBuilder.build') @mock.patch('rida.builder.KojiModuleBuilder.buildroot_connect') @mock.patch('rida.models.ModuleBuild.from_repo_done_event')