Differential D147

Add fuse scheduler
ClosedPublic
Actions

Authored by mkrizek on Jun 20 2014, 1:32 PM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T240: Implement "fuse" scheduler for Taskotron
Commits
rTRGR2c8ff34b3516: Add fuse scheduler
Summary

Fixes T240

Test Plan

Tests included.

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Add fuse scheduler.Jun 20 2014, 1:32 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal.
mkrizek added a task: T240: Implement "fuse" scheduler for Taskotron.
mkrizek added inline comments.Jun 20 2014, 1:34 PM
conf/trigger.cfg.example
16

Add comment that fuse_delay is in seconds.

jobtriggers/bodhi_msg.py
5

Should this be in the spec file in Requires? moksha.hub.reactor already includes this.

jobtriggers/config.py
41

Same as above.

tflink added a comment.Jun 23 2014, 2:29 AM

Overall, looks pretty good to me. I wanted to test it locally first but there aren't really many updates changing right now.

I assume that you've run this locally some, how long did you let it run?

I'm wondering if we want unit tests to cover the fuse scheduler case but I'm also not sure how much work it would be to stub out the live bits of fedmsg. Looking at their unite test suite may help, there.

jobtriggers/bodhi_msg.py
5

If we're directly importing it, I'd add it to the specfile's requires. Not strictly required but does help show which packages we're directly depending on

tflink requested changes to this revision.Jun 23 2014, 2:54 AM
tflink added inline comments.
jobtriggers/bodhi_msg.py
60–63

Can you add some logging statements here to indicate that a fused task has been "scheduled"?

This revision now requires changes to proceed.Jun 23 2014, 2:54 AM
mkrizek updated this revision to Diff 430.Jun 23 2014, 11:15 AM

Addressing issues

tflink requested changes to this revision.Jun 23 2014, 12:16 PM

We talked about this over IRC but I'd like to see some test coverage for the fuse scheduling - stubbing out the twisted/fedmsg components is fine but make sure that the proper items are queued and dequeued.

jobtriggers/bodhi_msg.py
60–63

Minor nit, but could you change that to "setting fuse (%d seconds) for koji_tag %s', (config.fuse_delay, koji_tag)"

This revision now requires changes to proceed.Jun 23 2014, 12:16 PM
mkrizek updated this revision to Diff 434.Jun 23 2014, 12:28 PM

Add missing test

mkrizek updated this revision to Diff 435.Jun 23 2014, 12:34 PM

Fix log statement

tflink accepted this revision.Jun 23 2014, 12:52 PM

Looks good to me

This revision is now accepted and ready to land.Jun 23 2014, 12:52 PM
mkrizek closed this revision.Jun 23 2014, 1:38 PM
mkrizek updated this revision to Diff 441.

Closed by commit rTRGR2c8ff34b3516 (authored by @mkrizek).

Revision Contents

Diff 441

View Options

conf/trigger.cfg.example

1[buildbot] 1​[buildbot]
2username = username 2​username = username
3password = password 3​password = password
4url = http://localhost/buildbot 4​url = http://localhost/buildbot
5 5​
6[trigger] 6​[trigger]
7koji_tasks = rpmlint 7​koji_tasks = rpmlint
8bodhi_to_koji_tag_tasks = upgradepath 8​bodhi_to_koji_tag_tasks = upgradepath
9bodhi_tasks = examplebodhi 9​bodhi_tasks = examplebodhi
10valid_arches = i386,i686,x86_64,noarch 10​valid_arches = i386,i686,x86_64,noarch
11koji_url = http://koji.fedoraproject.org/kojihub 11​koji_url = http://koji.fedoraproject.org/kojihub
12type = StreamTrigger 12​type = StreamTrigger
13blacklist_releases = el5,el6 13​blacklist_releases = el5,el6
14job_logging = False 14​job_logging = False
15joblog_file = /var/log/taskotron-trigger/jobs.csv 15​joblog_file = /var/log/taskotron-trigger/jobs.csv
16​fuse_delay = 1000 ; seconds
mkrizekAuthorUnsubmitted
Not Done

Add comment that fuse_delay is in seconds.

View Options

jobtriggers/__init__.py

1​import fedmsg.consumers
2​
3​from . import config, triggers, utils
4​
5​class JobTrigger(fedmsg.consumers.FedmsgConsumer):
6​ def __init__(self, *args, **kw):
7​ super(JobTrigger, self).__init__(*args, **kw)
8​ self.trigger = triggers.get_trigger(config.trigger_type)
9​
10​ def trigger_tasks(self, item, item_type, tasks, arches):
11​ for task in tasks:
12​ for arch in arches:
13​ self.log.info('triggering %s for %s on %s', task, item, arch)
14​
15​ if config.job_logging:
16​ try:
17​ utils.log_job(config.joblog_file, item, item_type, task, arch)
18​ except IOError, e:
19​ self.log.warning('Cannot log a job into %s', config.joblog_file)
20​
21​ output = self.trigger.trigger_job(item, item_type, task, arch)
22​ for line in output:
23​ self.log.info(line)
View Options

jobtriggers/bodhi_msg.py

1import fedmsg 1​import fedmsg
2import fedmsg.encoding 2​import fedmsg.encoding
3import fedmsg.consumers 3​import moksha.hub.reactor
4 4​
5from . import triggers, utils, config 5​from twisted.internet.task import LoopingCall
mkrizekAuthorUnsubmitted
Not Done

Should this be in the spec file in Requires? moksha.hub.reactor already includes this.

tflinkUnsubmitted
Not Done

If we're directly importing it, I'd add it to the specfile's requires. Not strictly required but does help show which packages we're directly depending on

6 6​
7​from . import utils, config
8​from . import JobTrigger
7 9​
8class BodhiJobTrigger(fedmsg.consumers.FedmsgConsumer): 10​class BodhiJobTrigger(JobTrigger):
9 topic = "org.fedoraproject.prod.bodhi.update.request.*" 11​ topic = "org.fedoraproject.prod.bodhi.update.request.*"
10 jsonify = False 12​ jsonify = False
11 config_key = 'taskotron.bodhijobtrigger.enabled' 13​ config_key = 'taskotron.bodhijobtrigger.enabled'
12 14​
13 def __init__(self, *args, **kw): 15​ def __init__(self, *args, **kw):
14 super(BodhiJobTrigger, self).__init__(*args, **kw) 16​ super(BodhiJobTrigger, self).__init__(*args, **kw)
15 self.trigger = triggers.get_trigger(config.trigger_type) 17​
18​ self.queued_tags = set()
19​ self.queued_arches = set()
20​
21​ # check for bodhi_to_koji_tags tasks queue every config.fuse_delay seconds
22​ lc = LoopingCall(self.delayed_consume)
23​ lc.start(config.fuse_delay)
24​
25​ def delayed_consume(self):
26​ if self.queued_tags:
27​ try:
28​ for tag in self.queued_tags:
29​ self.trigger_tasks(tag, 'koji_tag', config.bodhi_to_koji_tag_tasks, self.queued_arches)
30​ finally:
31​ self.queued_tags = set()
32​ self.queued_arches = set()
33​ else:
34​ self.log.debug("Woke up, but there were no messages.")
16 35​
17 def consume(self, message): 36​ def consume(self, message):
18 usable_message = fedmsg.encoding.loads(message.body) 37​ usable_message = fedmsg.encoding.loads(message.body)
19 38​
20 topic = usable_message['topic'] 39​ topic = usable_message['topic']
21 builds = usable_message['msg']['update']['builds'] 40​ builds = usable_message['msg']['update']['builds']
22 nvrs = [build['nvr'] for build in builds] 41​ nvrs = [build['nvr'] for build in builds]
23 42​
Show All 9 Lines
33 dist_tag = usable_message['msg']['update']['release']['dist_tag'] 52​ dist_tag = usable_message['msg']['update']['release']['dist_tag']
34 53​
35 koji_tag = '%s-updates' % dist_tag 54​ koji_tag = '%s-updates' % dist_tag
36 if topic.endswith('testing'): 55​ if topic.endswith('testing'):
37 koji_tag += '-testing' 56​ koji_tag += '-testing'
38 57​
39 arches = utils.get_arches(nvr=nvrs[0]) 58​ arches = utils.get_arches(nvr=nvrs[0])
40 59​
41 tasks = [] 60​ self.log.info('setting fuse (%d seconds) for koji_tag %s', config.fuse_delay, koji_tag)
42 tasks += [(updatetitle, 'bodhi_id', task) for task in config.bodhi_tasks] 61​ self.queued_tags.add(koji_tag)
43 tasks += [(koji_tag, 'koji_tag', task) for task in config.bodhi_to_koji_tag_tasks] 62​ for arch in arches:
44 63​ self.queued_arches.add(arch)
tflinkUnsubmitted
Not Done

Can you add some logging statements here to indicate that a fused task has been "scheduled"?

tflinkUnsubmitted
Not Done

Minor nit, but could you change that to "setting fuse (%d seconds) for koji_tag %s', (config.fuse_delay, koji_tag)"

45 for (item, item_type, task) in tasks: ​
46 for arch in arches: ​
47 self.log.info('triggering %s for %s on %s', task, item, arch) ​
48 ​
49 if config.job_logging: ​
50 try: ​
51 utils.log_job(config.joblog_file, item, item_type, task, arch) ​
52 except IOError, e: ​
53 self.log.warning('Cannot log a job into %s', config.joblog_file) ​
54 64​
55 output = self.trigger.trigger_job(item, item_type, task, arch) 65​ # run bodhi_id tasks for every update
56 for line in output: 66​ self.trigger_tasks(updatetitle, 'bodhi_id', config.bodhi_tasks, arches)
57 self.log.info(line) ​
View Options

jobtriggers/config.py

Show All 11 Lines
12bodhi_to_koji_tag_tasks = upgradepath 12​bodhi_to_koji_tag_tasks = upgradepath
13bodhi_tasks = examplebodhi 13​bodhi_tasks = examplebodhi
14valid_arches = i386,i686,x86_64,noarch 14​valid_arches = i386,i686,x86_64,noarch
15koji_url = http://koji.fedoraproject.org/kojihub 15​koji_url = http://koji.fedoraproject.org/kojihub
16type = StreamTrigger 16​type = StreamTrigger
17blacklist_releases = el5,el6 17​blacklist_releases = el5,el6
18job_logging = False 18​job_logging = False
19joblog_file = /var/log/taskotron-trigger/jobs.cvs 19​joblog_file = /var/log/taskotron-trigger/jobs.cvs
20​fuse_delay = 1000 ; seconds
20""" 21​"""
21 22​
22config = ConfigParser.ConfigParser() 23​config = ConfigParser.ConfigParser()
23config.readfp(io.BytesIO(defaults)) 24​config.readfp(io.BytesIO(defaults))
24config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg']) 25​config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg'])
25 26​
26 27​
27buildbot_username = config.get('buildbot', 'username') 28​buildbot_username = config.get('buildbot', 'username')
28buildbot_password = config.get('buildbot', 'password') 29​buildbot_password = config.get('buildbot', 'password')
29buildbot_url = config.get('buildbot', 'url') 30​buildbot_url = config.get('buildbot', 'url')
30 31​
31koji_tasks = [e.strip() for e in config.get('trigger', 'koji_tasks').split(',')] 32​koji_tasks = [e.strip() for e in config.get('trigger', 'koji_tasks').split(',')]
32bodhi_to_koji_tag_tasks = [e.strip() for e in config.get('trigger', 'bodhi_to_koji_tag_tasks').split(',')] 33​bodhi_to_koji_tag_tasks = [e.strip() for e in config.get('trigger', 'bodhi_to_koji_tag_tasks').split(',')]
33bodhi_tasks = [e.strip() for e in config.get('trigger', 'bodhi_tasks').split(',')] 34​bodhi_tasks = [e.strip() for e in config.get('trigger', 'bodhi_tasks').split(',')]
34valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',')] 35​valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',')]
35koji_url = config.get('trigger', 'koji_url') 36​koji_url = config.get('trigger', 'koji_url')
36trigger_type = config.get('trigger', 'type') 37​trigger_type = config.get('trigger', 'type')
37blacklist_releases = [e.strip() for e in config.get('trigger', 'blacklist_releases').split(',')] 38​blacklist_releases = [e.strip() for e in config.get('trigger', 'blacklist_releases').split(',')]
38job_logging = True if config.get('trigger', 'job_logging') == 'True' else False 39​job_logging = True if config.get('trigger', 'job_logging') == 'True' else False
39joblog_file = config.get('trigger', 'joblog_file') 40​joblog_file = config.get('trigger', 'joblog_file')
41​fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds
mkrizekAuthorUnsubmitted
Not Done

Same as above.

View Options

jobtriggers/koji_msg.py

1import fedmsg 1​import fedmsg
2import fedmsg.encoding 2​import fedmsg.encoding
3import fedmsg.consumers ​
4 ​
5from . import triggers, utils, config ​
6 3​
4​from . import utils, config
5​from . import JobTrigger
7 6​
8ITEM_TYPE = 'koji_build' 7​ITEM_TYPE = 'koji_build'
9 8​
10class KojiJobTrigger(fedmsg.consumers.FedmsgConsumer): 9​class KojiJobTrigger(JobTrigger):
11 topic = "org.fedoraproject.prod.buildsys.tag" 10​ topic = "org.fedoraproject.prod.buildsys.tag"
12 jsonify = False 11​ jsonify = False
13 config_key = 'taskotron.kojijobtrigger.enabled' 12​ config_key = 'taskotron.kojijobtrigger.enabled'
14 13​
15 def __init__(self, *args, **kw): 14​ def __init__(self, *args, **kw):
16 super(KojiJobTrigger, self).__init__(*args, **kw) 15​ super(KojiJobTrigger, self).__init__(*args, **kw)
17 self.trigger = triggers.get_trigger(config.trigger_type) ​
18 16​
19 def consume(self, message): 17​ def consume(self, message):
20 usable_message = fedmsg.encoding.loads(message.body) 18​ usable_message = fedmsg.encoding.loads(message.body)
21 19​
22 tag = usable_message['msg']['tag'] 20​ tag = usable_message['msg']['tag']
23 release = usable_message['msg']['release'] 21​ release = usable_message['msg']['release']
24 22​
25 # we look only for pending builds 23​ # we look only for pending builds
26 if not tag.endswith('pending'): 24​ if not tag.endswith('pending'):
27 return 25​ return
28 26​
29 # do not schledule jobs for blacklisted releases 27​ # do not schledule jobs for blacklisted releases
30 if release.endswith(tuple(config.blacklist_releases)): 28​ if release.endswith(tuple(config.blacklist_releases)):
31 return 29​ return
32 30​
33 name = usable_message['msg']['name'] 31​ name = usable_message['msg']['name']
34 version = usable_message['msg']['version'] 32​ version = usable_message['msg']['version']
35 buildid = usable_message['msg']['build_id'] 33​ buildid = usable_message['msg']['build_id']
36 34​
37 envr = "%s-%s-%s" % (name, version, release) 35​ envr = "%s-%s-%s" % (name, version, release)
38 36​
39 arches = utils.get_arches(buildid=buildid) 37​ arches = utils.get_arches(buildid=buildid)
40 38​
41 for task in config.koji_tasks: 39​ self.trigger_tasks(envr, ITEM_TYPE, config.koji_tasks, arches)
42 for arch in arches: ​
43 self.log.info('triggering %s for %s on %s', task, envr, arch) ​
44 ​
45 if config.job_logging: ​
46 try: ​
47 utils.log_job(config.joblog_file, envr, ITEM_TYPE, task, arch) ​
48 except IOError, e: ​
49 self.log.warning('Cannot log a job into %s', config.joblog_file) ​
50 ​
51 output = self.trigger.trigger_job(envr, ITEM_TYPE, task, arch) ​
52 for line in output: ​
53 self.log.info(line) ​
View Options

setup.py

1from setuptools import setup, Command 1​from setuptools import setup, Command
2 2​
3class PyTest(Command): 3​class PyTest(Command):
4 user_options = [] 4​ user_options = []
5 def initialize_options(self): 5​ def initialize_options(self):
6 pass 6​ pass
7 def finalize_options(self): 7​ def finalize_options(self):
8 pass 8​ pass
9 def run(self): 9​ def run(self):
10 import subprocess 10​ import subprocess
11 errno = subprocess.call(['py.test', 'testing']) 11​ errno = subprocess.call(['py.test', 'testing'])
12 raise SystemExit(errno) 12​ raise SystemExit(errno)
13 13​
14 14​
15setup( 15​setup(
16 name='jobtriggers', 16​ name='jobtriggers',
17 version='0.3.0', 17​ version='0.3.1',
18 description='triggering jobs via fedmsg', 18​ description='triggering jobs via fedmsg',
19 author='Tim Flink', 19​ author='Tim Flink',
20 author_email='tflink@fedoraproject.org', 20​ author_email='tflink@fedoraproject.org',
21 license='GPLv2+', 21​ license='GPLv2+',
22 url='https://fedorahosted.org/fedora-qa', 22​ url='https://fedorahosted.org/fedora-qa',
23 packages=['jobtriggers'], 23​ packages=['jobtriggers'],
24 entry_points={ 24​ entry_points={
25 'console_scripts': ['jobrunner=jobtriggers.jobrunner:main'], 25​ 'console_scripts': ['jobrunner=jobtriggers.jobrunner:main'],
Show All 13 Lines
View Options

taskotron-trigger.spec

1Name: taskotron-trigger 1​Name: taskotron-trigger
2Version: 0.3.0 2​Version: 0.3.1
3Release: 1%{?dist} 3​Release: 1%{?dist}
4Summary: Triggering Taskotron jobs via fedmsg. 4​Summary: Triggering Taskotron jobs via fedmsg.
5 5​
6License: GPLv2+ 6​License: GPLv2+
7URL: https://fedorahosted.org/fedora-qa 7​URL: https://fedorahosted.org/fedora-qa
8Source0: %{name}-%{version}.tar.gz 8​Source0: %{name}-%{version}.tar.gz
9 9​
10BuildArch: noarch 10​BuildArch: noarch
11 11​
12BuildRequires: python-setuptools 12​BuildRequires: python-setuptools
13Requires: koji 13​Requires: koji
14Requires: python-bunch 14​Requires: python-bunch
15Requires: python-requests 15​Requires: python-requests
16​Requires: python-twisted
16Requires: fedmsg 17​Requires: fedmsg
17Requires: fedmsg-hub 18​Requires: fedmsg-hub
18 19​
19%description 20​%description
20Triggering Taskotron jobs via fedmsg. 21​Triggering Taskotron jobs via fedmsg.
21 22​
22 23​
23%prep 24​%prep
Show All 31 Lines
55%dir %attr(755,fedmsg,fedmsg) %{_localstatedir}/log/taskotron-trigger 56​%dir %attr(755,fedmsg,fedmsg) %{_localstatedir}/log/taskotron-trigger
56 57​
57%dir %{_sysconfdir}/taskotron 58​%dir %{_sysconfdir}/taskotron
58%{_sysconfdir}/taskotron/trigger.cfg 59​%{_sysconfdir}/taskotron/trigger.cfg
59%{_sysconfdir}/fedmsg.d/taskotron-trigger.py* 60​%{_sysconfdir}/fedmsg.d/taskotron-trigger.py*
60 61​
61 62​
62%changelog 63​%changelog
63* Mon Jun 16 2014 Tim Flink <tflink@fedoraproject.org> - 0.2.1-1 64​* Mon Jun 23 2014 Martin Krizek <mkrizek@redhat.com> - 0.3.1-1
65​- add python-twisted as dep
66​
67​* Mon Jun 16 2014 Tim Flink <tflink@fedoraproject.org> - 0.3.0-1
64- releasing 0.3.0 68​- releasing 0.3.0
65 69​
66* Fri Jun 13 2014 Tim Flink <tflink@fedoraproject.org> - 0.2.1-1 70​* Fri Jun 13 2014 Tim Flink <tflink@fedoraproject.org> - 0.2.1-1
67- support triggering with koji_tag on bodhi update change 71​- support triggering with koji_tag on bodhi update change
68 72​
69* Thu May 29 2014 Tim Flink <tflink@fedoraproject.org> - 0.1.2-1 73​* Thu May 29 2014 Tim Flink <tflink@fedoraproject.org> - 0.1.2-1
70- Fixing typo that broke the jobrunner executable 74​- Fixing typo that broke the jobrunner executable
71 75​
Show All 14 Lines
View Options

testing/test_bodhi_trigger.py

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)38 self.ref_message = Bunch(body='{"msg": {"agent": "lmacken",\
43 "topic": "%s"}' % 43​ "topic": "%s"}' %
44 (ref_updatetitle, ref_dist_tag, ref_nvr, ref_topic)) 44​ (ref_updatetitle, ref_dist_tag, ref_nvr, ref_topic))
45 45​
46 def test_consume(self): 46​ def test_consume(self):
47 self.helper.consume(self.ref_message) 47​ self.helper.consume(self.ref_message)
48 48​
49 trigger_calls = self.helper.trigger.trigger_job.calls() 49​ trigger_calls = self.helper.trigger.trigger_job.calls()
50 50​
51 assert len(trigger_calls) == 8 51​ assert len(trigger_calls) == 4
52 52​
53 assert trigger_calls[0][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[0]) 53​ assert trigger_calls[0][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[0])
54 assert trigger_calls[1][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[1]) 54​ assert trigger_calls[1][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[1])
55 assert trigger_calls[2][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[0]) 55​ assert trigger_calls[2][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[0])
56 assert trigger_calls[3][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[1]) 56​ assert trigger_calls[3][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[1])
57 assert trigger_calls[4][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[0]) 57​
58 assert trigger_calls[5][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[1]) 58​ def test_consume_delayed_queues(self):
59 assert trigger_calls[6][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[0]) 59​ self.helper.consume(self.ref_message)
60 assert trigger_calls[7][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[1]) 60​
61​ trigger_calls = self.helper.trigger.trigger_job.calls()
62​
63​ assert self.helper.queued_tags == set([self.ref_koji_tag])
64​ assert self.helper.queued_arches == set(self.ref_validarches)
61 65​
62 def test_consume_notwatched_topic(self): 66​ def test_consume_notwatched_topic(self):
63 ref_topic = 'org.fedoraproject.pro.bodhi.update.request.randomtopic' 67​ ref_topic = 'org.fedoraproject.pro.bodhi.update.request.randomtopic'
64 self._create_msg(self.ref_updatetitle, self.ref_dist_tag, self.ref_nvr, ref_topic) 68​ self._create_msg(self.ref_updatetitle, self.ref_dist_tag, self.ref_nvr, ref_topic)
65 69​
66 self.helper.consume(self.ref_message) 70​ self.helper.consume(self.ref_message)
67 71​
68 trigger_calls = self.helper.trigger.trigger_job.calls() 72​ trigger_calls = self.helper.trigger.trigger_job.calls()
Show All 11 Lines76 def test_consume_blacklisted_release(self):
80 assert trigger_calls == [] 84​ assert trigger_calls == []
81 85​
82 def test_consume_kojitag_testing(self): 86​ def test_consume_kojitag_testing(self):
83 ref_topic = 'org.fedoraproject.pro.bodhi.update.request.testing' 87​ ref_topic = 'org.fedoraproject.pro.bodhi.update.request.testing'
84 self._create_msg(self.ref_updatetitle, self.ref_dist_tag, self.ref_nvr, ref_topic) 88​ self._create_msg(self.ref_updatetitle, self.ref_dist_tag, self.ref_nvr, ref_topic)
85 89​
86 self.helper.consume(self.ref_message) 90​ self.helper.consume(self.ref_message)
87 91​
92​ assert self.ref_koji_tag + '-testing' in self.helper.queued_tags
93​
94​ def test_delayed_consume(self):
95​ self.helper.queued_tags = [self.ref_koji_tag]
96​ self.helper.queued_arches = self.ref_validarches
97​
98​ self.helper.delayed_consume()
99​
88 trigger_calls = self.helper.trigger.trigger_job.calls() 100​ trigger_calls = self.helper.trigger.trigger_job.calls()
89 101​
90 assert trigger_calls[4][1][0] == self.ref_koji_tag + '-testing' 102​ assert len(trigger_calls) == 4
103​
104​ assert trigger_calls[0][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[0])
105​ assert trigger_calls[1][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[1])
106​ assert trigger_calls[2][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[0])
107​ assert trigger_calls[3][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[1])
108​
109​ assert self.helper.queued_tags == set()
110​ assert self.helper.queued_arches == set()