modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-03 02:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename method to KojiModuleBuilder.get_session()

Browse Source 
KojiModuleBuilder.get_session_from_config() will require the owner as an
argument, therefore drop encoding arguments in the method name.
This commit is contained in:
Nils Philippsen
2016-10-04 12:38:10 +02:00
parent b94c460184
commit 31ec1835db
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rida/builder.py
View File

@@ -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,

3
rida/scheduler/main.py
View File

@@ -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()

2
tests/test_scheduler/test_repo_done.py
View File

@@ -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')