Differential D527

enable Bodhi2 comments again, adjust Bodhi configuration
ClosedPublic
Actions

Authored by kparal on Aug 25 2015, 8:31 AM.

Details

Reviewers
lbrabec
tflink
jskladan
Maniphest Tasks
T583: Fix posting Bodhi comments
Commits
rLTRN8dd0fa47a234: enable Bodhi2 comments again, adjust Bodhi configuration
Summary
  • fix bodhi_utils and bodhi directives to work again (rely on update ids where possible)
  • enable bodhi2 comments, this time without the decision whether to send emails
  • replace 'bodhi_server' in config with 'bodhi_staging'
  • fix and add some unit tests
Test Plan

test suite works, I tested manually adding a comment to both stg and prod Bodhi, that also worked

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to enable Bodhi2 comments again, adjust Bodhi configuration.Aug 25 2015, 8:31 AM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added reviewers: tflink, jskladan, lbrabec.
kparal added a task: T583: Fix posting Bodhi comments.
kparal updated this revision to Diff 1379.Aug 25 2015, 8:36 AM
  • requirements.txt: require exact version of python-fedora

    Most of the fixes were already pushed into python-fedora, we can require specific version again.
jskladan accepted this revision.Aug 25 2015, 12:07 PM

Although I'd rather kill the code alltogether (especially since Bodhi does show the test results), I understand the need to notify the developer.

Macro tusken: whatev'

This revision is now accepted and ready to land.Aug 25 2015, 12:07 PM
tflink accepted this revision.Aug 25 2015, 3:24 PM
In D527#9940, @jskladan wrote:

Although I'd rather kill the code alltogether (especially since Bodhi does show the test results), I understand the need to notify the developer.

Yeah, I'd rather get rid of it as well but until the fedmsg bits are ready, this is punishment for not having those bits ready in time, I guess.

Looks good to me

requirements.txt
19

I'm wondering if this should match the >= of the specfile. I'm not sure if the changes in python-fedora are done for a while or not

kparal added inline comments.Aug 26 2015, 7:55 AM
requirements.txt
19

Since there were lots of compatibility issues with python-fedora, I'd rather request an exact version and bump it once we test it with (and adjust the code for) some newer version. But I don't have a strong opinion here, if you prefer >=, I'll put it back there. I simply assumed the major bodhi2 fix rush was over now.

Closed by commit rLTRN8dd0fa47a234: enable Bodhi2 comments again, adjust Bodhi configuration (authored by kparal). · Explain WhyAug 26 2015, 7:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1389

View Options

conf/taskotron.yaml.example

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)
49## server werkzeug). 49​## server werkzeug).
50 50​
51## URL of Koji instance used for querying about new builds 51​## URL of Koji instance used for querying about new builds
52#koji_url: http://koji.fedoraproject.org/kojihub 52​#koji_url: http://koji.fedoraproject.org/kojihub
53 53​
54## URL of repository of all the RPM packages built in Koji 54​## URL of repository of all the RPM packages built in Koji
55#pkg_url: http://kojipkgs.fedoraproject.org/packages 55​#pkg_url: http://kojipkgs.fedoraproject.org/packages
56 56​
57## URL of Bodhi instance used for communication about package updates 57​## Whether to use staging Bodhi instance instead of production (the
58## Please make sure the URL doesn't have a trailing slash. 58​## default one).
59#bodhi_server: https://bodhi.fedoraproject.org 59​#bodhi_staging: False
60#bodhi_server: http://localhost:5000/bodhi ​
61 60​
62## URL of ResultsDB server API interface, which can store all test results. 61​## URL of ResultsDB server API interface, which can store all test results.
63## Please make sure the URL doesn't have a trailing slash. 62​## Please make sure the URL doesn't have a trailing slash.
64#resultsdb_server: http://localhost:5001/api/v1.0 63​#resultsdb_server: http://localhost:5001/api/v1.0
65 64​
66## URL of ResultsDB frontend, which displays results from ResultsDB. 65​## URL of ResultsDB frontend, which displays results from ResultsDB.
67## Please make sure the URL doesn't have a trailing slash. 66​## Please make sure the URL doesn't have a trailing slash.
68#resultsdb_frontend: http://localhost:5002 67​#resultsdb_frontend: http://localhost:5002
▲ Show 20 Lines • Show All 65 Lines • ▼ Show 20 Line(s)
134## ==== SECRETS section ==== 133​## ==== SECRETS section ====
135## All login credentials and other secrets are here. If you add some secret 134​## All login credentials and other secrets are here. If you add some secret
136## here, make sure you make this file readable just for the right user accounts. 135​## here, make sure you make this file readable just for the right user accounts.
137 136​
138## FAS (Fedora Accounts System) credentials 137​## FAS (Fedora Accounts System) credentials
139## These credentials are used when reporting results into Bodhi. 138​## These credentials are used when reporting results into Bodhi.
140#fas_username: taskotron 139​#fas_username: taskotron
141#fas_password: '' 140​#fas_password: ''
142 ​
View Options

libtaskotron.spec

Show All 15 Lines
16Requires: createrepo 16​Requires: createrepo
17Requires: koji 17​Requires: koji
18Requires: libtaskotron-config 18​Requires: libtaskotron-config
19Requires: mash 19​Requires: mash
20Requires: pyOpenSSL 20​Requires: pyOpenSSL
21Requires: pytap13 >= 0.3.0 21​Requires: pytap13 >= 0.3.0
22Requires: python-bayeux >= 0.9 22​Requires: python-bayeux >= 0.9
23Requires: python-bunch >= 1.0.1 23​Requires: python-bunch >= 1.0.1
24Requires: python-fedora >= 0.5.2 24​Requires: python-fedora >= 0.5.5
25Requires: python-hawkey >= 0.4.13-1 25​Requires: python-hawkey >= 0.4.13-1
26Requires: python-pycurl 26​Requires: python-pycurl
27Requires: python-setuptools 27​Requires: python-setuptools
28Requires: python-urlgrabber 28​Requires: python-urlgrabber
29Requires: python-yamlish >= 0.18 29​Requires: python-yamlish >= 0.18
30Requires: PyYAML >= 3.11 30​Requires: PyYAML >= 3.11
31Requires: resultsdb_api >= 1.2.1 31​Requires: resultsdb_api >= 1.2.1
32Requires: rpm-python 32​Requires: rpm-python
33BuildRequires: koji 33​BuildRequires: koji
34BuildRequires: mash 34​BuildRequires: mash
35BuildRequires: pytap13 >= 0.3.0 35​BuildRequires: pytap13 >= 0.3.0
36BuildRequires: pytest >= 2.6.4 36​BuildRequires: pytest >= 2.6.4
37BuildRequires: python-bayeux >= 0.9 37​BuildRequires: python-bayeux >= 0.9
38BuildRequires: python-bunch >= 1.0.1 38​BuildRequires: python-bunch >= 1.0.1
39BuildRequires: python-devel 39​BuildRequires: python-devel
40BuildRequires: python-dingus >= 0.3.4 40​BuildRequires: python-dingus >= 0.3.4
41BuildRequires: python-fedora >= 0.5.2 41​BuildRequires: python-fedora >= 0.5.5
42BuildRequires: python-hawkey >= 0.4.13-1 42​BuildRequires: python-hawkey >= 0.4.13-1
43BuildRequires: python-setuptools 43​BuildRequires: python-setuptools
44BuildRequires: python-urlgrabber 44​BuildRequires: python-urlgrabber
45BuildRequires: PyYAML >= 3.11 45​BuildRequires: PyYAML >= 3.11
46BuildRequires: resultsdb_api >= 1.2.1 46​BuildRequires: resultsdb_api >= 1.2.1
47 47​
48 48​
49%description 49​%description
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines
View Options

libtaskotron/bodhi_utils.py

Show All 30 Lines29 def __init__(self, client=None):
31 31​
32 :param client: custom :class:`Bodhi2Client` instance. If ``None``, a 32​ :param client: custom :class:`Bodhi2Client` instance. If ``None``, a
33 default Bodhi2Client instance is used. 33​ default Bodhi2Client instance is used.
34 ''' 34​ '''
35 35​
36 self.config = config.get_config() 36​ self.config = config.get_config()
37 37​
38 if not client: 38​ if not client:
39 log.debug('Creating Bodhi client to %s' % self.config.bodhi_server) 39​ self.client = fedora.client.bodhi.Bodhi2Client(staging=self.config.bodhi_staging,
40 self.client = fedora.client.bodhi.Bodhi2Client(base_url=self.config.bodhi_server, ​
41 username=self.config.fas_username, 40​ username=self.config.fas_username,
42 password=self.config.fas_password) 41​ password=self.config.fas_password)
42​ log.debug('Created Bodhi client to: %s', self.client.base_url)
43 # automatically retry failed requests (HTTP 5xx and similar) 43​ # automatically retry failed requests (HTTP 5xx and similar)
44 self.client.retries = 10 44​ self.client.retries = 10
45 else: 45​ else:
46 self.client = client 46​ self.client = client
47 47​
48 def query_update(self, package): 48​ def get_update(self, updateid):
49 '''Get the last Bodhi update matching criteria. 49​ '''Get the last Bodhi update for the specified update ID.
50 50​
51 :param str package: package NVR or package name or update title or 51​ :param str updateid: update ID, e.g. 'FEDORA-2015-13787'
52 update ID 52​ :return: Bodhi update object with that ID, or ``None`` when no such
53 53​ update is found
54 .. note:: 54​ :rtype: :class:`munch.Munch`
55 Only NVR allowed, not NEVR. See ​
56 https://fedorahosted.org/bodhi/ticket/592. ​
57 :return: most recent Bodhi update object matching criteria, or ``None`` ​
58 when no update is found ​
59 :rtype: :class:`bunch.Bunch` ​
60 ''' 55​ '''
61 log.debug('Searching Bodhi updates for: %s', package) 56​ log.debug('Searching Bodhi updates for: %s', updateid)
62 # FIXME: https://github.com/fedora-infra/bodhi/issues/164 57​ res = self.client.query(updateid=updateid)
63 raise NotImplementedError('This has been broken when upgrading to Bodhi 2. Fix pending.') 58​ assert 0 <= len(res['updates']) <= 1
64 res = self.client.query(package=package, limit=1) 59​
65 if res['updates']: 60​ if res['updates']:
66 return res['updates'][0] 61​ return res['updates'][0]
67 else: 62​ else:
68 return None 63​ return None
69 64​
70 def build2update(self, builds, strict=False): 65​ def build2update(self, builds, strict=False):
71 '''Find matching Bodhi updates for provided builds. 66​ '''Find matching Bodhi updates for provided builds.
72 67​
Show All 9 Lines71 :param bool strict: if ``False``, incomplete Bodhi updates are allowed.
82 ``builds`` that were part of this incomplete update 77​ ``builds`` that were part of this incomplete update
83 are placed in the second dictionary of the result 78​ are placed in the second dictionary of the result
84 tuple. 79​ tuple.
85 :return: a tuple of two dictionaries: 80​ :return: a tuple of two dictionaries:
86 81​
87 * The first dict provides mapping between ``builds`` and their 82​ * The first dict provides mapping between ``builds`` and their
88 updates where no error occured. 83​ updates where no error occured.
89 84​
90 ``{build (string): Bodhi update (Bunch)}`` 85​ ``{build (string): Bodhi update (Munch)}``
91 * The second dict provides mapping between ``builds`` and their 86​ * The second dict provides mapping between ``builds`` and their
92 updates where some error occured. The value is ``None`` if 87​ updates where some error occured. The value is ``None`` if
93 the matching Bodhi update could not be found (the only 88​ the matching Bodhi update could not be found (the only
94 possible cause of failure if ``strict=False``). Or the value 89​ possible cause of failure if ``strict=False``). Or the value
95 is a Bodhi update that was incomplete (happens only if 90​ is a Bodhi update that was incomplete (happens only if
96 ``strict=True``). 91​ ``strict=True``).
97 92​
98 ``{build (string): Bodhi update (Bunch) or None}`` 93​ ``{build (string): Bodhi update (Munch) or None}``
99 * The set of keys in both these dictionaries correspond exactly 94​ * The set of keys in both these dictionaries correspond exactly
100 to ``builds``. For every build provided in ``builds`` you'll 95​ to ``builds``. For every build provided in ``builds`` you'll
101 get an answer in either the first or the second dictionary, 96​ get an answer in either the first or the second dictionary,
102 and there will be no extra builds that you haven't specified. 97​ and there will be no extra builds that you haven't specified.
103 :raise TaskotronValueError: if ``builds`` type is incorrect 98​ :raise TaskotronValueError: if ``builds`` type is incorrect
104 ''' 99​ '''
105 # validate input params 100​ # validate input params
106 if not python_utils.iterable(builds, basestring): 101​ if not python_utils.iterable(builds, basestring):
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines
View Options

libtaskotron/config_defaults.py

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s)23class Config(object):
47 profile = ProfileName.DEVELOPMENT #: 47​ profile = ProfileName.DEVELOPMENT #:
48 48​
49 reporting_enabled = False #: 49​ reporting_enabled = False #:
50 report_to_bodhi = True #: 50​ report_to_bodhi = True #:
51 report_to_resultsdb = True #: 51​ report_to_resultsdb = True #:
52 52​
53 koji_url = 'http://koji.fedoraproject.org/kojihub' #: 53​ koji_url = 'http://koji.fedoraproject.org/kojihub' #:
54 pkg_url = 'http://kojipkgs.fedoraproject.org/packages' #: 54​ pkg_url = 'http://kojipkgs.fedoraproject.org/packages' #:
55 bodhi_server = 'https://bodhi.fedoraproject.org' #: 55​ bodhi_staging = False #:
56 execdb_server = 'http://localhost:5003' #: 56​ execdb_server = 'http://localhost:5003' #:
57 resultsdb_server = 'http://localhost:5001/api/v1.0' #: 57​ resultsdb_server = 'http://localhost:5001/api/v1.0' #:
58 resultsdb_frontend = 'http://localhost:5002' #: 58​ resultsdb_frontend = 'http://localhost:5002' #:
59 taskotron_master = 'http://localhost/taskmaster' #: 59​ taskotron_master = 'http://localhost/taskmaster' #:
60 artifacts_baseurl = 'http://localhost/artifacts' #: 60​ artifacts_baseurl = 'http://localhost/artifacts' #:
61 buildbot_task_step = 'runtask' #: 61​ buildbot_task_step = 'runtask' #:
62 download_cache_enabled = True #: 62​ download_cache_enabled = True #:
63 63​
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines
View Options

libtaskotron/directives/bodhi_comment_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5from __future__ import absolute_import 5​from __future__ import absolute_import
6 6​
7DOCUMENTATION = """ 7​DOCUMENTATION = """
8module: bodhi_comment_directive 8​module: bodhi_comment_directive
9short_description: create a comment for a Bodhi update 9​short_description: create a comment for a Bodhi update
10description: | 10​description: |
11 Take TAP formmated check results, find all `Bodhi`_ update results in it, 11​ Take TAP formmated check results, find all `Bodhi`_ update results in it,
12 and post a comment under each of these updates stating the result of the 12​ and post a comment under each of these updates stating the result of the
13 check. 13​ check.
14 14​
15 .. _Bodhi: https://admin.fedoraproject.org/updates/ 15​ .. _Bodhi: https://bodhi.fedoraproject.org
16 16​
17 The comment will roughly look like this:: 17​ The comment will roughly look like this::
18 18​
19 Taskotron: rpmlint test PASSED on x86_64. Result log: <url> 19​ Taskotron: depcheck test PASSED on x86_64. Result log: <url>
20 20​
21 .. note:: You have to have ``fas_username`` and ``fas_password`` configured 21​ .. note:: You have to have ``fas_username`` and ``fas_password`` configured
22 in your config file, otherwise the comments won't be posted. 22​ in your config file, otherwise the comments won't be posted.
23 23​
24 .. note:: The <url> will point to the Buildbot's full stdio log. 24​ .. note:: The <url> will point to the Buildbot's full stdio log.
25 It is possible to make the <url> point to the respective ResultsDB's 25​ It is possible to make the <url> point to the respective ResultsDB's
26 result page, if you use the ``resultsdb_directive``'s exported output 26​ result page, if you use the ``resultsdb_directive``'s exported output
27 as an input for this directive (see Examples section). 27​ as an input for this directive (see Examples section).
28parameters: 28​parameters:
29 results: 29​ results:
30 required: true 30​ required: true
31 description: single or multiple check results in TAP13 format 31​ description: single or multiple check results in TAP13 format. Only results
32​ with ``type: bodhi_update`` will be processed. The ``item: `` value has
33​ to be a Bodhi update ID.
32 type: str 34​ type: str
33 doreport: 35​ doreport:
34 required: true 36​ required: true
35 description: | 37​ description: |
36 select ``all`` to always post the check result, regardless of 38​ select ``all`` to always post the check result, regardless of
37 previoust Taskotron comments for the same update. Select ``onchange`` to 39​ previoust Taskotron comments for the same update. Select ``onchange`` to
38 only post comments if the check result status changed (e.g. from ``FAILED`` 40​ only post comments if the check result status changed (e.g. from ``FAILED``
39 to ``PASSED``), or if the ``FAILED`` status repeats itself **and** long 41​ to ``PASSED``), or if the ``FAILED`` status repeats itself **and** long
▲ Show 20 Lines • Show All 122 Lines • ▼ Show 20 Line(s)163 except TaskotronValueError as e:
162 log.exception(e) 164​ log.exception(e)
163 raise TaskotronDirectiveError("Failed to load the 'results':"\ 165​ raise TaskotronDirectiveError("Failed to load the 'results':"\
164 "%s" % e) 166​ "%s" % e)
165 167​
166 # Filter the results of "BODHI_UPDATE" type 168​ # Filter the results of "BODHI_UPDATE" type
167 check_details = [r for r in check_details 169​ check_details = [r for r in check_details
168 if r.report_type == check.ReportType.BODHI_UPDATE] 170​ if r.report_type == check.ReportType.BODHI_UPDATE]
169 171​
170 # ? Log when no results of the type are found ? ​
171 ​
172 _, log_url = buildbot_utils.get_urls(env_data['jobid'], 172​ _, log_url = buildbot_utils.get_urls(env_data['jobid'],
173 Config.taskotron_master, 173​ Config.taskotron_master,
174 Config.buildbot_task_step) 174​ Config.buildbot_task_step)
175 175​
176 log.info('Posting %s results to Bodhi...', len(check_details)) 176​ log.info('Posting %s results to Bodhi...', len(check_details))
177 177​
178 for index, detail in enumerate(check_details, start=1): 178​ for index, detail in enumerate(check_details, start=1):
179 # Check for the presence of resultsdb's result id, and create 179​ # Check for the presence of resultsdb's result id, and create
Show All 24 Lines
204 if index % 20 == 0 or index == len(check_details): 204​ if index % 20 == 0 or index == len(check_details):
205 log.info('Bodhi results submitted: %d/%d', index, 205​ log.info('Bodhi results submitted: %d/%d', index,
206 len(check_details)) 206​ len(check_details))
207 207​
208 return output_data 208​ return output_data
209 209​
210 210​
211class BodhiUpdateState: 211​class BodhiUpdateState:
212 def __init__(self, name, kojitag='updates'): 212​ def __init__(self, update_id, kojitag='updates'):
213 self.test_states = { 'depcheck_32':'NORUN', 213​ self.test_states = { 'depcheck_32':'NORUN',
214 'depcheck_64':'NORUN', 214​ 'depcheck_64':'NORUN',
215 'upgradepath':'NORUN' 215​ 'upgradepath':'NORUN'
216 } 216​ }
217 217​
218 # since upgradepath is only run on updates-pending, 218​ # since upgradepath is only run on updates-pending,
219 # set it to passed if we're working on updates-testing 219​ # set it to passed if we're working on updates-testing
220 if kojitag == 'updates-testing': 220​ if kojitag == 'updates-testing':
221 self.test_states['upgradepath'] = 'PASSED' 221​ self.test_states['upgradepath'] = 'PASSED'
222 222​
223 self.result_history = [] 223​ self.result_history = []
224 self.update_name = name 224​ self.update_id = update_id
225 self.test_change = False 225​ self.test_change = False
226 226​
227 def num_results(self): 227​ def num_results(self):
228 ''' Retrieve the number of results currently held ''' 228​ ''' Retrieve the number of results currently held '''
229 return len(self.result_history) 229​ return len(self.result_history)
230 230​
231 def add_result(self, new_result): 231​ def add_result(self, new_result):
232 ''' Update the current state with a new result. 232​ ''' Update the current state with a new result.
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)281 def get_state_str(self):
287 return state_str 287​ return state_str
288 288​
289 def did_test_change(self): 289​ def did_test_change(self):
290 ''' Determine whether the state of any tests changed with the addition 290​ ''' Determine whether the state of any tests changed with the addition
291 of the last result''' 291​ of the last result'''
292 return self.test_change 292​ return self.test_change
293 293​
294 294​
295def _is_comment_email_needed(update_name, parsed_comments, new_result, 295​def _is_comment_email_needed(update_id, parsed_comments, new_result,
296 kojitag): 296​ kojitag):
297 ''' 297​ '''
298 Determines whether or not to send an email with the comment posted to bodhi. 298​ Determines whether or not to send an email with the comment posted to bodhi.
299 Uses previous comments on update in order to determine current state 299​ Uses previous comments on update in order to determine current state
300 300​
301 :param str update_name: name of the update to be tested 301​ :param str update_id: ID of the update to be tested
302 :param parsed_comments: already existing Taskotron comments for 302​ :param parsed_comments: already existing Taskotron comments for
303 the update 303​ the update
304 :type parsed_comments: list of dict 304​ :type parsed_comments: list of dict
305 :param dict new_result: the new result to be posted 305​ :param dict new_result: the new result to be posted
306 :param str kojitag: the koji tag being tested (affects the expected tests) 306​ :param str kojitag: the koji tag being tested (affects the expected tests)
307 :rtype: bool 307​ :rtype: bool
308 ''' 308​ '''
309 309​
310 # compute current state 310​ # compute current state
311 update_state = BodhiUpdateState(update_name, kojitag=kojitag) 311​ update_state = BodhiUpdateState(update_id, kojitag=kojitag)
312 for result in parsed_comments: 312​ for result in parsed_comments:
313 update_state.add_result(result) 313​ update_state.add_result(result)
314 314​
315 current_state = update_state.get_state() 315​ current_state = update_state.get_state()
316 log.debug('Current state for %s: %s\n %s', update_name, current_state, 316​ log.debug('Current state for %s: %s\n %s', update_id, current_state,
317 update_state.get_state_str()) 317​ update_state.get_state_str())
318 update_state.add_result(new_result) 318​ update_state.add_result(new_result)
319 new_state = update_state.get_state() 319​ new_state = update_state.get_state()
320 log.debug('New state for %s: %s\n %s', update_name, new_state, 320​ log.debug('New state for %s: %s\n %s', update_id, new_state,
321 update_state.get_state_str()) 321​ update_state.get_state_str())
322 322​
323 # by default, we want to send email on state change, so start from there 323​ # by default, we want to send email on state change, so start from there
324 send_email = True 324​ send_email = True
325 325​
326 if new_state is PASS and current_state is not FAIL: 326​ if new_state is PASS and current_state is not FAIL:
327 send_email = False 327​ send_email = False
328 328​
329 log.debug('Bodhi email needed for %s: %s', update_name, 329​ log.debug('Bodhi email needed for %s: %s', update_id,
330 'yes' if send_email else 'no') 330​ 'yes' if send_email else 'no')
331 331​
332 return send_email 332​ return send_email
333 333​
334 334​
335def _parse_result_from_comment(comment): 335​def _parse_result_from_comment(comment):
336 ''' 336​ '''
337 Parses timestamp and results from bodhi comment 337​ Parses timestamp and results from bodhi comment
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)366def _already_commented(update, testname, arch):
379 379​
380 Config = config.get_config() 380​ Config = config.get_config()
381 381​
382 comment_re = r'Taskotron:[\s]+%s[\s]+test[\s]+(\w+)[\s]+on[\s]+%s' % (testname, arch) 382​ comment_re = r'Taskotron:[\s]+%s[\s]+test[\s]+(\w+)[\s]+on[\s]+%s' % (testname, arch)
383 old_result = '' 383​ old_result = ''
384 comment_time = '' 384​ comment_time = ''
385 385​
386 taskotron_comments = [comment for comment in update['comments'] 386​ taskotron_comments = [comment for comment in update['comments']
387 if comment['author'] == Config.fas_username] 387​ if comment['user']['name'] == Config.fas_username]
388 for comment in taskotron_comments: 388​ for comment in taskotron_comments:
389 m = re.match(comment_re, comment['text']) 389​ m = re.match(comment_re, comment['text'])
390 if m is None: 390​ if m is None:
391 continue 391​ continue
392 old_result = m.group(1) 392​ old_result = m.group(1)
393 comment_time = comment['timestamp'] 393​ comment_time = comment['timestamp']
394 # check whether update was modified after the last posted comment 394​ # check whether update was modified after the last posted comment
395 if update['date_modified'] > comment_time: 395​ if update['date_modified'] > comment_time:
396 return ('','') 396​ return ('','')
397 return (old_result, comment_time) 397​ return (old_result, comment_time)
398 398​
399 399​
400def _is_comment_needed(old_result, comment_time, result, time_span = None): 400​def _is_comment_needed(old_result, comment_time, result, time_span = None):
401 '''Check if the comment is meant to be posted. 401​ '''Check if the comment is meant to be posted.
402 402​
403 :param str old_result: the result of the last test 403​ :param str old_result: the result of the last test
404 :param str comment_time: the comment time of the last test 404​ :param str comment_time: the comment time of the last test
405 :param str result: the result of the test 405​ :param str result: the result of the test
406 :param int time_span: waiting period (in minutes) before posting the same comment 406​ :param int time_span: waiting period (in minutes) before posting the same comment
407 407​
408 :return: ``True`` if the comment will be posted, ``False`` otherwise. 408​ :return: ``True`` if the comment will be posted, ``False`` otherwise.
409 :rtype: bool 409​ :rtype: bool
410 ''' 410​ '''
411​ # NOTE: Bodhi2 no longer supports forcing or supressing emails:
412​ # https://github.com/fedora-infra/bodhi/issues/289
413​ # (they might decide to change it, the ticket is not closed yet)
414​
411 # the first comment or a comment with different result, post it 415​ # the first comment or a comment with different result, post it
412 if not old_result or old_result != result: 416​ if not old_result or old_result != result:
413 return True 417​ return True
414 418​
415 # If we got here, it means that the comment with the same result has been 419​ # If we got here, it means that the comment with the same result has been
416 # already posted, we now need to determine whether we can post the 420​ # already posted, we now need to determine whether we can post the
417 # comment again or not. 421​ # comment again or not.
418 # If the previous result is *not* 'FAILED', we won't post it in order not to 422​ # If the previous result is *not* 'FAILED', we won't post it in order not to
419 # spam developers. 423​ # spam developers.
420 # If the previous result *is* 'FAILED', we will need to check whether given 424​ # If the previous result *is* 'FAILED', we will need to check whether given
421 # time span expired, if so, we will post the same comment again to remind 425​ # time span expired, if so, we will post the same comment again to remind
422 # a developer about the issue. 426​ # a developer about the issue.
423 427​
424 if result != 'FAILED': 428​ if result != 'FAILED':
425 return False 429​ return False
426 430​
427 if time_span is None: 431​ if time_span is None:
428 Config = config.get_config() 432​ Config = config.get_config()
429 time_span = Config.bodhi_posting_comments_span 433​ time_span = Config.bodhi_posting_comments_span
430 434​
431 ​
432 posted_datetime = datetime.datetime.strptime(comment_time, '%Y-%m-%d %H:%M:%S') 435​ posted_datetime = datetime.datetime.strptime(comment_time, '%Y-%m-%d %H:%M:%S')
433 436​
434 delta = (datetime.datetime.utcnow() - posted_datetime) 437​ delta = (datetime.datetime.utcnow() - posted_datetime)
435 # total_seconds() is introduced in python 2.7, until 2.7 is everywhere... 438​ # total_seconds() is introduced in python 2.7, until 2.7 is everywhere...
436 delta_minutes = (delta.seconds + delta.days * 24 * 3600) / 60 439​ delta_minutes = (delta.seconds + delta.days * 24 * 3600) / 60
437 440​
438 if delta_minutes < time_span: 441​ if delta_minutes < time_span:
439 return False 442​ return False
440 443​
441 return True 444​ return True
442 445​
443 446​
444def _post_testresult(bodhi_api, update, testname, result, url, 447​def _post_testresult(bodhi_api, updateid, testname, result, url,
445 arch = 'noarch', karma = 0, doreport='onchange'): 448​ arch = 'noarch', karma = 0, doreport='onchange'):
446 '''Post comment and karma to bodhi 449​ '''Post comment and karma to bodhi
447 450​
448 :param str update: the **title** of the update comment on 451​ :param str updateid: the ID of the update to comment on
449 :param str testname: the name of the test 452​ :param str testname: the name of the test
450 :param str result: the result of the test 453​ :param str result: the result of the test
451 :param str url: url of the result of the test 454​ :param str url: url of the result of the test
452 :param str arch: tested architecture (default ``noarch``) 455​ :param str arch: tested architecture (default ``noarch``)
453 :param int karma: karma points (default ``0``) 456​ :param int karma: karma points (default ``0``)
454 :param str doreport: set to 'all' to force posting bodhi comment 457​ :param str doreport: set to 'all' to force posting bodhi comment
455 458​
456 :return: ``True`` if comment was posted successfully or comment wasn't 459​ :return: ``True`` if comment was posted successfully or comment wasn't
457 meant to be posted (either posting is turned off or comment was 460​ meant to be posted (either posting is turned off or comment was
458 already posted), ``False`` otherwise. 461​ already posted), ``False`` otherwise.
459 :rtype: bool 462​ :rtype: bool
460 ''' 463​ '''
461 464​
462 # TODO when new bodhi releases, add update identification by UPDATEID support ​
463 ​
464 Config = config.get_config() 465​ Config = config.get_config()
465 466​
466 if not update or not testname or not result or url == None: 467​ if not updateid or not testname or not result or url is None:
467 log.error("bodhi_post_testresults() requires non-empty update, "\ 468​ log.error("bodhi_post_testresults() requires non-empty updateid, "
468 "testname, result and url arguments.") 469​ "testname, result and url arguments.")
469 return False 470​ return False
470 471​
471 if not Config.fas_username or not Config.fas_password: 472​ if not Config.fas_username or not Config.fas_password:
472 log.error('Conf file containing FAS credentials is incomplete!') 473​ log.error('Conf file containing FAS credentials is incomplete!')
473 return False 474​ return False
474 475​
475 if result in ['ABORTED', 'CRASHED']: 476​ if result in ['ABORTED', 'CRASHED']:
476 log.debug("Results with outcome of CRASHED or ABORTED are not submitted" 477​ log.debug("Results with outcome of CRASHED or ABORTED are not submitted"
477 " to bodhi: %s %s" % (update, result)) 478​ " to bodhi: %s %s" % (updateid, result))
478 return True 479​ return True
479 480​
480 log.debug('Posting a result to Bodhi for: %s', update) 481​ log.debug('Posting a result to Bodhi for: %s', updateid)
481 482​
482 comment = 'Taskotron: %s test %s on %s. Result log: %s ' \ 483​ comment = 'Taskotron: %s test %s on %s. Result log: %s ' \
483 '(results are informative only)' % (testname, result, arch, url) 484​ '(results are informative only)' % (testname, result, arch, url)
484 try: 485​ try:
485 bodhi_update = bodhi_api.query_update(update) 486​ bodhi_update = bodhi_api.get_update(updateid)
487​ if not bodhi_update:
488​ # this might happen for old Bodhi1 updates still circulating in the system,
489​ # the TAP might not contain `item: updateid` but `item: update_title`
490​ log.warning("No update with ID '%s' found, skipping...")
491​ return False
486 492​
487 (old_result, comment_time) = _already_commented(bodhi_update, testname, 493​ (old_result, comment_time) = _already_commented(bodhi_update, testname, arch)
488 arch) ​
489 comment_needed = _is_comment_needed(old_result, comment_time, result) 494​ comment_needed = _is_comment_needed(old_result, comment_time, result)
490 495​
491 if not comment_needed and doreport != 'all': 496​ if not comment_needed and doreport != 'all':
492 log.debug('Up-to-date test result is already present in Bodhi: %s %s', 497​ log.debug('Up-to-date test result is already present in Bodhi: %s %s',
493 update, result) 498​ updateid, result)
494 return True 499​ return True
495 500​
496 parsed_results = [] 501​ # submit the comment
497 for found_comment in bodhi_update['comments']: 502​ bodhi_api.client.comment(bodhi_update['title'], comment, karma)
498 if found_comment['author'] == Config.fas_username: ​
499 parsed_results.append(_parse_result_from_comment(found_comment)) ​
500 ​
501 kojitag = 'updates-testing' ​
502 if bodhi_update['request'] == 'stable' or bodhi_update['status'] == 'stable': ​
503 kojitag = 'updates' ​
504 ​
505 new_result = {'time':datetime.datetime.utcnow(), 'testname':testname, ​
506 'result':result, 'arch':arch} ​
507 ​
508 send_email = _is_comment_email_needed(update, parsed_results, ​
509 new_result, kojitag) ​
510 ​
511 ​
512 if not bodhi_api.client.comment(update, comment, karma, send_email): ​
513 log.error('Could not post a comment to Bodhi. %r, %r, %r, %r', ​
514 update, comment, karma, send_email) ​
515 return False ​
516 ​
517 log.debug('Test result successfully submitted to Bodhi: %s %s', 503​ log.debug('Test result successfully submitted to Bodhi: %s %s',
518 update, result) 504​ updateid, result)
519 505​
520 except Exception as e: 506​ except Exception as e:
521 log.exception(e) 507​ log.exception(e)
522 return False 508​ return False
523 509​
524 return True 510​ return True
View Options

libtaskotron/directives/bodhi_directive.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5from __future__ import absolute_import 5​from __future__ import absolute_import
6 6​
7DOCUMENTATION = """ 7​DOCUMENTATION = """
8module: bodhi_directive 8​module: bodhi_directive
9short_description: download updates from Bodhi 9​short_description: download updates from Bodhi
10description: | 10​description: |
11 The bodhi directive interfaces with `Bodhi`_ to facilitate various actions. 11​ The bodhi directive interfaces with `Bodhi`_ to facilitate various actions.
12 At the moment, the only action supported is downloading updates (i.e. all RPMs 12​ At the moment, the only action supported is downloading updates (i.e. all RPMs
13 from all builds related to a specific update). 13​ from all builds related to a specific update).
14 14​
15 .. _Bodhi: https://admin.fedoraproject.org/updates/ 15​ .. _Bodhi: https://bodhi.fedoraproject.org
16parameters: 16​parameters:
17 action: 17​ action:
18 required: true 18​ required: true
19 description: specify action type. The only action available at the moment 19​ description: specify action type. The only action available at the moment
20 is ``download``. 20​ is ``download``.
21 type: str 21​ type: str
22 bodhi_id: 22​ update_id:
23 required: true 23​ required: true
24 description: Bodhi update ID to download. This is usually in the form of 24​ description: Bodhi update ID to download, e.g. ``FEDORA-2014-7485``.
25 ``FEDORA-2014-7485`` or ``pykickstart-1.99.42-1.fc20,anaconda-20.23-1.fc20``. ​
26 type: str 25​ type: str
27 arch: 26​ arch:
28 required: true 27​ required: true
29 description: | 28​ description: |
30 a list of architectures for which to download RPMs. 29​ a list of architectures for which to download RPMs.
31 30​
32 Note: ``noarch`` RPMs are always automatically downloaded even when not 31​ Note: ``noarch`` RPMs are always automatically downloaded even when not
33 requested, unless ``arch=[]`` and ``src=True``. 32​ requested, unless ``arch=[]`` and ``src=True``.
34 type: list of str 33​ type: list of str
35 src: 34​ src:
36 required: false 35​ required: false
37 description: download also ``src`` RPM files 36​ description: download also ``src`` RPM files
38 type: bool 37​ type: bool
39 default: False 38​ default: False
40returns: | 39​returns: |
41 A dictionary containing following items: 40​ A dictionary containing following items:
42 41​
43 * ``downloaded_rpms``: (list of str) a list of local filenames of the 42​ * ``downloaded_rpms``: (list of str) a list of local filenames of the
44 downloaded RPMs 43​ downloaded RPMs
45raises: | 44​raises: |
46 * :class:`.TaskotronDirectiveError`: if no update with ``bodhi_id`` has been 45​ * :class:`.TaskotronDirectiveError`: if no update with ``update_id`` has been
47 found 46​ found
48 * :class:`.TaskotronRemoteError`: if downloading failed 47​ * :class:`.TaskotronRemoteError`: if downloading failed
49 * :class:`.TaskotronValueError`: if ``arch=[]`` and ``src=False``, therefore 48​ * :class:`.TaskotronValueError`: if ``arch=[]`` and ``src=False``, therefore
50 there is nothing to download 49​ there is nothing to download
51version_added: 0.4 50​version_added: 0.4
52""" 51​"""
53 52​
54EXAMPLES = """ 53​EXAMPLES = """
55Download a Bodhi update provided on the command line and then check it with 54​Download a Bodhi update provided on the command line and then check it with
56rpmlint:: 55​rpmlint::
57 56​
58 - name: download update from Bodhi 57​ - name: download update from Bodhi
59 bodhi: 58​ bodhi:
60 action: download 59​ action: download
61 bodhi_id: ${bodhi_id} 60​ update_id: ${update_id}
62 arch: ${arch} 61​ arch: ${arch}
63 62​
64 - name: run rpmlint on downloaded rpms 63​ - name: run rpmlint on downloaded rpms
65 python: 64​ python:
66 file: run_rpmlint.py 65​ file: run_rpmlint.py
67 callable: run 66​ callable: run
68 workdir: ${workdir} 67​ workdir: ${workdir}
69 export: rpmlint_output 68​ export: rpmlint_output
Show All 17 Lines82 def __init__(self, bodhi_api=None, koji_session=None):
87 else: 86​ else:
88 self.bodhi_api = bodhi.BodhiUtils() 87​ self.bodhi_api = bodhi.BodhiUtils()
89 88​
90 if koji_session: 89​ if koji_session:
91 self.koji_session = koji_session 90​ self.koji_session = koji_session
92 else: 91​ else:
93 self.koji_session = KojiClient() 92​ self.koji_session = KojiClient()
94 93​
95 def action_download(self, update, arches, src, workdir): 94​ def action_download(self, updateid, arches, src, workdir):
96 95​
97 res = self.bodhi_api.query_update(update) 96​ res = self.bodhi_api.get_update(updateid)
98 97​
99 if res is None: 98​ if res is None:
100 raise TaskotronDirectiveError("Update with id '%s' wasn't found" 99​ raise TaskotronDirectiveError("Update with ID '%s' wasn't found" % updateid)
101 % update) ​
102 100​
103 nvrs = [build['nvr'] for build in res['builds']] 101​ nvrs = [build['nvr'] for build in res['builds']]
104 102​
105 downloaded_rpms = [] 103​ downloaded_rpms = []
106 104​
107 for nvr in nvrs: 105​ for nvr in nvrs:
108 res = self.koji_session.get_nvr_rpms(nvr, workdir, arches, src=src) 106​ res = self.koji_session.get_nvr_rpms(nvr, workdir, arches, src=src)
109 downloaded_rpms.extend(res) 107​ downloaded_rpms.extend(res)
110 108​
111 return downloaded_rpms 109​ return downloaded_rpms
112 110​
113 def process(self, input_data, env_data): 111​ def process(self, input_data, env_data):
114 output_data = {} 112​ output_data = {}
115 113​
116 valid_actions = ['download'] 114​ valid_actions = ['download']
117 115​
118 action = input_data['action'] 116​ action = input_data['action']
119 117​
120 if action not in valid_actions: 118​ if action not in valid_actions:
121 raise TaskotronDirectiveError('%s is not a valid command for bodhi directive' 119​ raise TaskotronDirectiveError('%s is not a valid command for bodhi directive'
122 % action) 120​ % action)
123 121​
124 if action == 'download': 122​ if action == 'download':
125 if 'bodhi_id' not in input_data or 'arch' not in input_data: 123​ if 'update_id' not in input_data or 'arch' not in input_data:
126 detected_args = ', '.join(input_data.keys()) 124​ detected_args = ', '.join(input_data.keys())
127 raise TaskotronDirectiveError("The bodhi directive 'download'" 125​ raise TaskotronDirectiveError(
128 " requires both 'bodhi_id' and" 126​ "The bodhi directive 'download' requires both 'update_id' and "
129 " 'arch' arguments. Detected arguments: %s" % detected_args) 127​ "'arch' arguments. Detected arguments: %s" % detected_args)
130 128​
131 workdir = env_data['workdir'] 129​ workdir = env_data['workdir']
132 update = input_data['bodhi_id'] 130​ updateid = input_data['update_id']
133 if 'all' in input_data['arch']: 131​ if 'all' in input_data['arch']:
134 arches = Arches.base + ['noarch'] 132​ arches = Arches.base + ['noarch']
135 else: 133​ else:
136 arches = input_data['arch'] 134​ arches = input_data['arch']
137 if arches and ('noarch' not in arches): 135​ if arches and ('noarch' not in arches):
138 arches.append('noarch') 136​ arches.append('noarch')
139 137​
140 src = input_data.get('src', False) 138​ src = input_data.get('src', False)
141 139​
142 log.info("getting rpms for update %s (%s) and downloading to %s", 140​ log.info("getting rpms for update %s (%s) and downloading to %s",
143 update, arches, workdir) 141​ updateid, arches, workdir)
144 142​
145 output_data['downloaded_rpms'] = self.action_download(update, arches, src, workdir) 143​ output_data['downloaded_rpms'] = self.action_download(updateid, arches, src, workdir)
146 144​
147 return output_data 145​ return output_data
View Options

requirements.txt

Show All 10 Lines
11# you can define a dependency range here instead of an exact version. 11​# you can define a dependency range here instead of an exact version.
12 12​
13bayeux == 0.9 13​bayeux == 0.9
14bunch == 1.0.1 14​bunch == 1.0.1
15dingus == 0.3.4 15​dingus == 0.3.4
16pytap13 == 0.3.0 16​pytap13 == 0.3.0
17pytest == 2.6.4 17​pytest == 2.6.4
18pytest-cov == 1.8.1 18​pytest-cov == 1.8.1
19# heavy changes in python-fedora these days, temporarily use >= instead == 19​python-fedora == 0.5.5
tflinkUnsubmitted
Not Done

I'm wondering if this should match the >= of the specfile. I'm not sure if the changes in python-fedora are done for a while or not

kparalAuthorUnsubmitted
Not Done

Since there were lots of compatibility issues with python-fedora, I'd rather request an exact version and bump it once we test it with (and adjust the code for) some newer version. But I don't have a strong opinion here, if you prefer >=, I'll put it back there. I simply assumed the major bodhi2 fix rush was over now.

20python-fedora >= 0.5.2 ​
21PyYAML == 3.11 20​PyYAML == 3.11
22resultsdb_api == 1.2.1 21​resultsdb_api == 1.2.1
23Sphinx == 1.2.3 22​Sphinx == 1.2.3
24yamlish == 0.18 23​yamlish == 0.18
View Options

testing/test_bodhi_comment_directive.py

Show All 28 Lines25 def setup(self, monkeypatch):
29 Config.reporting_enabled = True 29​ Config.reporting_enabled = True
30 Config.report_to_bodhi = True 30​ Config.report_to_bodhi = True
31 31​
32 self.ref_job_id = 123 32​ self.ref_job_id = 123
33 self.ref_log_url = '%s/builders/all/builds/%d/steps/runtask/logs/stdio'\ 33​ self.ref_log_url = '%s/builders/all/builds/%d/steps/runtask/logs/stdio'\
34 % (Config.taskotron_master, self.ref_job_id) 34​ % (Config.taskotron_master, self.ref_job_id)
35 35​
36 self.comment = { 36​ self.comment = {
37 "author": Config.fas_username, 37​ "user": {'name': Config.fas_username},
38 "timestamp": "2014-01-31 10:11:12", 38​ "timestamp": "2014-01-31 10:11:12",
39 "text": "Taskotron: depcheck test PASSED on x86_64. Result log: %s" % self.ref_log_url, 39​ "text": "Taskotron: depcheck test PASSED on x86_64. Result log: %s" % self.ref_log_url,
40 } 40​ }
41 41​
42 self.update = { 42​ self.update = {
43 'request': 'stable', 43​ 'title': 'update title',
44 'comments': [self.comment], 44​ 'request': 'stable',
45 'date_modified': "2014-01-31 10:00:00" 45​ 'comments': [self.comment],
46 } 46​ 'date_modified': "2014-01-31 10:00:00"
47​ }
47 48​
48 self.stub_bodhi = Dingus(query_update__returns = self.update) 49​ self.stub_bodhi = Dingus(get_update__returns=self.update)
49 self.directive = bodhi_comment_directive.BodhiCommentDirective(self.stub_bodhi) 50​ self.directive = bodhi_comment_directive.BodhiCommentDirective(self.stub_bodhi)
50 51​
51 self.cd = check.CheckDetail( 52​ self.cd = check.CheckDetail(
52 item = 'update_title', 53​ item='update_id',
53 report_type = check.ReportType.BODHI_UPDATE, 54​ report_type=check.ReportType.BODHI_UPDATE,
54 outcome = 'PASSED', 55​ outcome='PASSED',
55 ) 56​ )
56 57​
57 58​
58 tap = check.export_TAP(self.cd) 59​ tap = check.export_TAP(self.cd)
59 60​
60 self.ref_input = { 61​ self.ref_input = {
61 'results': tap, 62​ 'results': tap,
62 'doreport': 'onchange', 63​ 'doreport': 'onchange',
63 } 64​ }
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s)161 def test_is_comment_needed_decide_repost(self, monkeypatch):
181 comment_time = date_posted.strftime('%Y-%m-%d %H:%M:%S') 182​ comment_time = date_posted.strftime('%Y-%m-%d %H:%M:%S')
182 outcome = bodhi_comment_directive._is_comment_needed('FAILED', comment_time, 'FAILED', time_span) 183​ outcome = bodhi_comment_directive._is_comment_needed('FAILED', comment_time, 'FAILED', time_span)
183 assert outcome is True 184​ assert outcome is True
184 185​
185 def test_post_testresult_params_and_config(self): 186​ def test_post_testresult_params_and_config(self):
186 """Checks whether missing parameters/config values terminate 187​ """Checks whether missing parameters/config values terminate
187 _post_testresults.""" 188​ _post_testresults."""
188 # Test empty parameters 189​ # Test empty parameters
189 outcome = bodhi_comment_directive._post_testresult(Dingus(), 190​ outcome = bodhi_comment_directive._post_testresult(Dingus(), updateid=None, testname=None,
190 update = None, 191​ result=None, url=None)
191 testname = None, ​
192 result = None, ​
193 url = None) ​
194 assert outcome is False 192​ assert outcome is False
195 193​
196 # Test configuration 194​ # Test configuration
197 Config = config.get_config() 195​ Config = config.get_config()
198 Config.fas_username = None 196​ Config.fas_username = None
199 Config.fas_password = None 197​ Config.fas_password = None
200 outcome = bodhi_comment_directive._post_testresult(Dingus(), 198​ outcome = bodhi_comment_directive._post_testresult(Dingus(), updateid=True,
201 update = True, 199​ testname=True, result=True, url=True)
202 testname = True, ​
203 result = True, ​
204 url = True) ​
205 config._config = None 200​ config._config = None
206 assert outcome is False 201​ assert outcome is False
207 202​
208 @pytest.fixture 203​ @pytest.fixture
209 def prepare_for_bodhi_comment(self, monkeypatch): 204​ def prepare_for_bodhi_comment(self, monkeypatch):
210 """Sets up environment for fake bodhi comment calls""" 205​ """Sets up environment for fake bodhi comment calls"""
211 Config = config.get_config() 206​ Config = config.get_config()
212 Config.fas_password = "secret!" 207​ Config.fas_password = "secret!"
213 208​
214 stub_already_commented = lambda *args, **kwargs: ('', '') 209​ stub_already_commented = lambda *args, **kwargs: ('', '')
215 stub_return_true = lambda *args, **kwargs: True 210​ stub_return_true = lambda *args, **kwargs: True
216 stub_return_false = lambda *args, **kwargs: False 211​ stub_return_false = lambda *args, **kwargs: False
217 212​
218 monkeypatch.setattr(bodhi_comment_directive, '_already_commented', stub_already_commented) 213​ monkeypatch.setattr(bodhi_comment_directive, '_already_commented', stub_already_commented)
219 monkeypatch.setattr(bodhi_comment_directive, '_is_comment_needed', stub_return_true) 214​ monkeypatch.setattr(bodhi_comment_directive, '_is_comment_needed', stub_return_true)
220 monkeypatch.setattr(bodhi_comment_directive, '_is_comment_email_needed', stub_return_false) 215​ monkeypatch.setattr(bodhi_comment_directive, '_is_comment_email_needed', stub_return_false)
221 216​
222 217​
223 def test_post_testresult_comment_not_needed(self, monkeypatch, prepare_for_bodhi_comment): 218​ def test_post_testresult_comment_not_needed(self, monkeypatch, prepare_for_bodhi_comment):
224 """Checks the behaviour when comment is not needed.""" 219​ """Checks the behaviour when comment is not needed."""
225 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 220​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
226 221​
227 monkeypatch.setattr(bodhi_comment_directive, '_is_comment_needed', lambda *a, **k: False) 222​ monkeypatch.setattr(bodhi_comment_directive, '_is_comment_needed', lambda *a, **k: False)
228 223​
229 outcome = bodhi_comment_directive._post_testresult(self.stub_bodhi, 224​ outcome = bodhi_comment_directive._post_testresult(
230 update = True, 225​ self.stub_bodhi, updateid=True, testname=True, result=True, url=True,
231 testname = True, 226​ doreport='onchange')
232 result = True, ​
233 url = True, ​
234 doreport = 'onchange') ​
235 assert outcome is True 227​ assert outcome is True
236 assert len(self.stub_bodhi.client.calls()) == 0 228​ assert len(self.stub_bodhi.client.calls()) == 0
237 229​
238 def test_post_testresult(self, prepare_for_bodhi_comment): 230​ def test_post_testresult(self, prepare_for_bodhi_comment):
239 """Checks whether _post_testresult maps arguments correctly to 231​ """Checks whether _post_testresult maps arguments correctly to
240 the bodhi comment call.""" 232​ the bodhi comment call."""
241 ref_comment = "Taskotron: depcheck test PASSED on noarch. "\ 233​ ref_comment = "Taskotron: depcheck test PASSED on noarch. "\
242 "Result log: %s (results are informative only)" % self.ref_log_url 234​ "Result log: %s (results are informative only)" % self.ref_log_url
243 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 235​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
244 236​
245 bodhi_comment_directive._post_testresult(self.stub_bodhi, 237​ bodhi_comment_directive._post_testresult(
246 update="update_title", testname="depcheck", result="PASSED", 238​ self.stub_bodhi, updateid="update_id", testname="depcheck", result="PASSED",
247 url=self.ref_log_url) 239​ url=self.ref_log_url)
248 240​
249 # Select the first call of "comment" method. 241​ # Select the first call of "comment" method.
250 call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0] 242​ call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0]
251 # Select the positional arguments of that call 243​ # Select the positional arguments of that call
252 call_data = call[1] 244​ call_data = call[1]
253 245​
254 assert call_data[0] == "update_title" 246​ assert call_data[0] == "update title"
255 assert call_data[1] == ref_comment 247​ assert call_data[1] == ref_comment
256 assert call_data[2] == 0 248​ assert call_data[2] == 0
257 assert call_data[3] is False ​
258 249​
259 def test_post_testresult_aborted(self, prepare_for_bodhi_comment): 250​ def test_post_testresult_aborted(self, prepare_for_bodhi_comment):
260 """Checks whether _post_testresult correctly does not submit comments 251​ """Checks whether _post_testresult correctly does not submit comments
261 for ABORTED results.""" 252​ for ABORTED results."""
262 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 253​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
263 254​
264 bodhi_comment_directive._post_testresult(self.stub_bodhi, 255​ bodhi_comment_directive._post_testresult(
265 update="update_title", testname="depcheck", result="ABORTED", 256​ self.stub_bodhi, updateid="update_id", testname="depcheck", result="ABORTED",
266 url=self.ref_log_url) 257​ url=self.ref_log_url)
267 258​
268 # if the result was properly ignored, this should be empty 259​ # if the result was properly ignored, this should be empty
269 assert len(self.stub_bodhi.client.calls) == 0 260​ assert len(self.stub_bodhi.client.calls) == 0
270 261​
271 def test_post_testresult_crashed(self, prepare_for_bodhi_comment): 262​ def test_post_testresult_crashed(self, prepare_for_bodhi_comment):
272 """Checks whether _post_testresult correctly does not submit comments 263​ """Checks whether _post_testresult correctly does not submit comments
273 for ABORTED results.""" 264​ for ABORTED results."""
274 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 265​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
275 266​
276 bodhi_comment_directive._post_testresult(self.stub_bodhi, 267​ bodhi_comment_directive._post_testresult(
277 update="update_title", testname="depcheck", result="CRASHED", 268​ self.stub_bodhi, updateid="update_id", testname="depcheck", result="CRASHED",
278 url=self.ref_log_url) 269​ url=self.ref_log_url)
279 270​
280 # if the result was properly ignored, this should be empty 271​ # if the result was properly ignored, this should be empty
281 assert len(self.stub_bodhi.client.calls) == 0 272​ assert len(self.stub_bodhi.client.calls) == 0
282 273​
283 def test_tap_mapping(self, prepare_for_bodhi_comment): 274​ def test_tap_mapping(self, prepare_for_bodhi_comment):
284 """Checks whether TAP output is mapped correctly to 275​ """Checks whether TAP output is mapped correctly to
285 the bodhi comment call.""" 276​ the bodhi comment call."""
286 ref_comment = "Taskotron: depcheck test PASSED on noarch. "\ 277​ ref_comment = "Taskotron: depcheck test PASSED on noarch. "\
287 "Result log: %s (results are informative only)" % self.ref_log_url 278​ "Result log: %s (results are informative only)" % self.ref_log_url
288 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 279​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
289 280​
290 self.directive.process(self.ref_input, self.ref_envdata) 281​ self.directive.process(self.ref_input, self.ref_envdata)
291 282​
292 # Select the first call of "comment" method. 283​ # Select the first call of "comment" method.
293 call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0] 284​ call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0]
294 # Select the positional arguments of that call 285​ # Select the positional arguments of that call
295 call_data = call[1] 286​ call_data = call[1]
296 287​
297 assert call_data[0] == "update_title" 288​ assert call_data[0] == "update title"
298 assert call_data[1] == ref_comment 289​ assert call_data[1] == ref_comment
299 assert call_data[2] == 0 290​ assert call_data[2] == 0
300 assert call_data[3] is False ​
301 291​
302 def test_tap_mapping_resultsdb(self, prepare_for_bodhi_comment): 292​ def test_tap_mapping_resultsdb(self, prepare_for_bodhi_comment):
303 """Checks whether TAP output is mapped correctly to 293​ """Checks whether TAP output is mapped correctly to
304 the bodhi comment call when resultsdb_result_id is provided""" 294​ the bodhi comment call when resultsdb_result_id is provided"""
305 295​
306 Config = config.get_config() 296​ Config = config.get_config()
307 297​
308 cd = check.CheckDetail( 298​ cd = check.CheckDetail(
309 item='update_title', 299​ item='update_id',
310 report_type=check.ReportType.BODHI_UPDATE, 300​ report_type=check.ReportType.BODHI_UPDATE,
311 outcome='PASSED', 301​ outcome='PASSED',
312 ) 302​ )
313 cd._internal = {'resultsdb_result_id': 1234} 303​ cd._internal = {'resultsdb_result_id': 1234}
314 log_url = "%s/results/1234" % Config.resultsdb_frontend 304​ log_url = "%s/results/1234" % Config.resultsdb_frontend
315 305​
316 tap = check.export_TAP(cd) 306​ tap = check.export_TAP(cd)
317 307​
318 ref_input = { 308​ ref_input = {
319 'results': tap, 309​ 'results': tap,
320 'doreport': 'onchange', 310​ 'doreport': 'onchange',
321 } 311​ }
322 312​
323 ref_comment = "Taskotron: depcheck test PASSED on noarch. "\ 313​ ref_comment = "Taskotron: depcheck test PASSED on noarch. "\
324 "Result log: %s (results are informative only)" % log_url 314​ "Result log: %s (results are informative only)" % log_url
325 self.stub_bodhi.client = Dingus('bodhi_api.bodhi') 315​ self.stub_bodhi.client = Dingus('bodhi_api.bodhi')
326 316​
327 self.directive.process(ref_input, self.ref_envdata) 317​ self.directive.process(ref_input, self.ref_envdata)
328 318​
329 # Select the first call of "comment" method. 319​ # Select the first call of "comment" method.
330 call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0] 320​ call = [call for call in self.stub_bodhi.client.calls() if call[0] == 'comment'][0]
331 # Select the positional arguments of that call 321​ # Select the positional arguments of that call
332 call_data = call[1] 322​ call_data = call[1]
333 323​
334 assert call_data[0] == "update_title" 324​ assert call_data[0] == "update title"
335 assert call_data[1] == ref_comment 325​ assert call_data[1] == ref_comment
336 assert call_data[2] == 0 326​ assert call_data[2] == 0
337 assert call_data[3] is False ​
338 327​
339 def test_is_comment_email_needed(self, monkeypatch): 328​ def test_is_comment_email_needed(self, monkeypatch):
340 def mock_BodhiUpdateState_factory(current_state, new_state): 329​ def mock_BodhiUpdateState_factory(current_state, new_state):
341 330​
342 class MockBodhiUpdateState(Dingus): 331​ class MockBodhiUpdateState(Dingus):
343 def __init__(self, *args, **kwargs): 332​ def __init__(self, *args, **kwargs):
344 Dingus.__init__(self, *args, **kwargs) 333​ Dingus.__init__(self, *args, **kwargs)
345 self.state = current_state 334​ self.state = current_state
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

testing/test_bodhi_directive.py

Show All 10 Lines
11from libtaskotron.directives import bodhi_directive 11​from libtaskotron.directives import bodhi_directive
12from libtaskotron.exceptions import TaskotronDirectiveError 12​from libtaskotron.exceptions import TaskotronDirectiveError
13 13​
14class TestBodhiDownloads(): 14​class TestBodhiDownloads():
15 15​
16 def setup_method(self, method): 16​ def setup_method(self, method):
17 '''Run this before every test invocation''' 17​ '''Run this before every test invocation'''
18 self.ref_arch = ['x86_64'] 18​ self.ref_arch = ['x86_64']
19 self.ref_bodhi_id = 'FEDORA-1234-56789' 19​ self.ref_update_id = 'FEDORA-1234-56789'
20 self.ref_workdir = '/var/tmp/foo' 20​ self.ref_workdir = '/var/tmp/foo'
21 self.ref_taskfile = '/foo/bar/task.yml' 21​ self.ref_taskfile = '/foo/bar/task.yml'
22 self.ref_nvr1 = 'foo-1.2.3.fc99' 22​ self.ref_nvr1 = 'foo-1.2.3.fc99'
23 self.ref_nvr2 = 'bar-1.2.3.fc99' 23​ self.ref_nvr2 = 'bar-1.2.3.fc99'
24 self.ref_update = {'title': 'Random update', 24​ self.ref_update = {'title': 'Random update',
25 'builds': [{'nvr': self.ref_nvr1, 'package': {}}, 25​ 'builds': [{'nvr': self.ref_nvr1, 'package': {}},
26 {'nvr': self.ref_nvr2, 'package': {}} 26​ {'nvr': self.ref_nvr2, 'package': {}}
27 ], 27​ ],
28 'other_keys': {} 28​ 'other_keys': {}
29 } 29​ }
30 self.ref_input = {'action': 'download', 30​ self.ref_input = {'action': 'download',
31 'arch': self.ref_arch, 31​ 'arch': self.ref_arch,
32 'bodhi_id': self.ref_bodhi_id 32​ 'update_id': self.ref_update_id
33 } 33​ }
34 self.ref_envdata = {'workdir': self.ref_workdir} 34​ self.ref_envdata = {'workdir': self.ref_workdir}
35 self.ref_rpmfile = '%s/%s.rpm' % (self.ref_workdir, self.ref_nvr1) 35​ self.ref_rpmfile = '%s/%s.rpm' % (self.ref_workdir, self.ref_nvr1)
36 36​
37 self.helper = bodhi_directive.BodhiDirective() 37​ self.helper = bodhi_directive.BodhiDirective()
38 38​
39 39​
40 def test_action_download_existing_update(self): 40​ def test_action_download_existing_update(self):
41 '''Test download of existing update''' 41​ '''Test download of existing update'''
42 stub_bodhi = Dingus(query_update__returns = self.ref_update) 42​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
43 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 43​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
44 44​
45 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 45​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
46 46​
47 output_data = test_bodhi.process(self.ref_input, self.ref_envdata) 47​ output_data = test_bodhi.process(self.ref_input, self.ref_envdata)
48 48​
49 ref_output_data = {'downloaded_rpms': [self.ref_rpmfile, 49​ ref_output_data = {'downloaded_rpms': [self.ref_rpmfile,
50 self.ref_rpmfile]} 50​ self.ref_rpmfile]}
51 getrpms_calls = stub_koji.calls() 51​ getrpms_calls = stub_koji.calls()
52 requested_nvrs = map(lambda x: x[1][0], getrpms_calls) 52​ requested_nvrs = map(lambda x: x[1][0], getrpms_calls)
53 53​
54 # checks whether get_nvr_rpms was called for every update 54​ # checks whether get_nvr_rpms was called for every update
55 # with correct nvrs 55​ # with correct nvrs
56 assert len(getrpms_calls) == 2 56​ assert len(getrpms_calls) == 2
57 assert requested_nvrs == [self.ref_nvr1, self.ref_nvr2] 57​ assert requested_nvrs == [self.ref_nvr1, self.ref_nvr2]
58 assert output_data == ref_output_data 58​ assert output_data == ref_output_data
59 59​
60 60​
61 def test_action_download_all_archs(self): 61​ def test_action_download_all_archs(self):
62 '''Test download when all arches are demanded''' 62​ '''Test download when all arches are demanded'''
63 self.ref_arch = ['all'] 63​ self.ref_arch = ['all']
64 self.ref_input = {'action': 'download', 64​ self.ref_input = {'action': 'download',
65 'arch': self.ref_arch, 65​ 'arch': self.ref_arch,
66 'bodhi_id': self.ref_bodhi_id 66​ 'update_id': self.ref_update_id
67 } 67​ }
68 68​
69 stub_bodhi = Dingus(query_update__returns = self.ref_update) 69​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
70 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 70​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
71 71​
72 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 72​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
73 73​
74 test_bodhi.process(self.ref_input, self.ref_envdata) 74​ test_bodhi.process(self.ref_input, self.ref_envdata)
75 75​
76 ref_arches = set(['i386', 'x86_64', 'noarch', 'armhfp']) 76​ ref_arches = set(['i386', 'x86_64', 'noarch', 'armhfp'])
77 getrpms_calls = stub_koji.calls() 77​ getrpms_calls = stub_koji.calls()
78 req_arches = map(lambda x: x[1][2], getrpms_calls) 78​ req_arches = map(lambda x: x[1][2], getrpms_calls)
79 79​
80 # checks whether all get_nvr_rpms calls demanded all arches 80​ # checks whether all get_nvr_rpms calls demanded all arches
81 assert all(map(lambda x: set(x) == ref_arches, req_arches)) 81​ assert all(map(lambda x: set(x) == ref_arches, req_arches))
82 82​
83 def test_action_download_source(self): 83​ def test_action_download_source(self):
84 '''Test download of source packages''' 84​ '''Test download of source packages'''
85 self.ref_arch = [] 85​ self.ref_arch = []
86 self.ref_input = {'action': 'download', 86​ self.ref_input = {'action': 'download',
87 'arch': self.ref_arch, 87​ 'arch': self.ref_arch,
88 'bodhi_id': self.ref_bodhi_id, 88​ 'update_id': self.ref_update_id,
89 'src': True 89​ 'src': True
90 } 90​ }
91 91​
92 stub_bodhi = Dingus(query_update__returns = self.ref_update) 92​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
93 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 93​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
94 94​
95 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 95​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
96 96​
97 test_bodhi.process(self.ref_input, self.ref_envdata) 97​ test_bodhi.process(self.ref_input, self.ref_envdata)
98 98​
99 getrpm_calls = stub_koji.calls() 99​ getrpm_calls = stub_koji.calls()
100 100​
101 # checks whether all get_nvr_rpms calls demanded only source pkgs 101​ # checks whether all get_nvr_rpms calls demanded only source pkgs
102 assert all(map(lambda x: x[1][2] == [], getrpm_calls)) 102​ assert all(map(lambda x: x[1][2] == [], getrpm_calls))
103 assert all(map(lambda x: x[2]['src'], getrpm_calls)) 103​ assert all(map(lambda x: x[2]['src'], getrpm_calls))
104 104​
105 def test_action_download_multiple_arch(self): 105​ def test_action_download_multiple_arch(self):
106 '''Test download of multiple arches packages''' 106​ '''Test download of multiple arches packages'''
107 self.ref_arch = ['x86_64', 'noarch'] 107​ self.ref_arch = ['x86_64', 'noarch']
108 self.ref_input = {'action': 'download', 108​ self.ref_input = {'action': 'download',
109 'arch': self.ref_arch, 109​ 'arch': self.ref_arch,
110 'bodhi_id': self.ref_bodhi_id 110​ 'update_id': self.ref_update_id
111 } 111​ }
112 112​
113 stub_bodhi = Dingus(query_update__returns = self.ref_update) 113​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
114 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 114​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
115 115​
116 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 116​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
117 117​
118 test_bodhi.process(self.ref_input, self.ref_envdata) 118​ test_bodhi.process(self.ref_input, self.ref_envdata)
119 119​
120 getrpms_calls = stub_koji.calls() 120​ getrpms_calls = stub_koji.calls()
121 req_arches = map(lambda x: x[1][2], getrpms_calls) 121​ req_arches = map(lambda x: x[1][2], getrpms_calls)
122 122​
123 # checks whether all get_nvr_rpms calls demanded only source pkgs 123​ # checks whether all get_nvr_rpms calls demanded only source pkgs
124 assert all(map(lambda x: x == ['x86_64', 'noarch'], req_arches)) 124​ assert all(map(lambda x: x == ['x86_64', 'noarch'], req_arches))
125 125​
126 def test_action_download_added_noarch(self): 126​ def test_action_download_added_noarch(self):
127 '''Test whether noarch is automaticaly added''' 127​ '''Test whether noarch is automaticaly added'''
128 self.ref_arch = ['i386'] 128​ self.ref_arch = ['i386']
129 self.ref_input = {'action': 'download', 129​ self.ref_input = {'action': 'download',
130 'arch': self.ref_arch, 130​ 'arch': self.ref_arch,
131 'bodhi_id': self.ref_bodhi_id 131​ 'update_id': self.ref_update_id
132 } 132​ }
133 133​
134 stub_bodhi = Dingus(query_update__returns = self.ref_update) 134​ stub_bodhi = Dingus(get_update__returns=self.ref_update)
135 stub_koji = Dingus(get_nvr_rpms__returns = [self.ref_rpmfile]) 135​ stub_koji = Dingus(get_nvr_rpms__returns=[self.ref_rpmfile])
136 136​
137 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 137​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
138 138​
139 test_bodhi.process(self.ref_input, self.ref_envdata) 139​ test_bodhi.process(self.ref_input, self.ref_envdata)
140 140​
141 getrpms_calls = stub_koji.calls() 141​ getrpms_calls = stub_koji.calls()
142 req_arches = map(lambda x: x[1][2], getrpms_calls) 142​ req_arches = map(lambda x: x[1][2], getrpms_calls)
143 143​
144 # checks whether noarch is demanded in all get_nvr_rpms calls 144​ # checks whether noarch is demanded in all get_nvr_rpms calls
145 assert all(map(lambda x: 'noarch' in x, req_arches)) 145​ assert all(map(lambda x: 'noarch' in x, req_arches))
146 146​
147 147​
148 def test_action_download_nonexisting_update(self): 148​ def test_action_download_nonexisting_update(self):
149 '''Test whether exception is raised when no update is found''' 149​ '''Test whether exception is raised when no update is found'''
150 stub_bodhi = Dingus(query_update__returns = None) 150​ stub_bodhi = Dingus(get_update__returns=None)
151 stub_koji = Dingus(get_nvr_rpms__returns = "It shouldn't go this far") 151​ stub_koji = Dingus(get_nvr_rpms__returns="It shouldn't go this far")
152 152​
153 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 153​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
154 154​
155 # No update is found, b. directive should raise an Exception 155​ # No update is found, b. directive should raise an Exception
156 with pytest.raises(TaskotronDirectiveError): 156​ with pytest.raises(TaskotronDirectiveError):
157 test_bodhi.process(self.ref_input, self.ref_envdata) 157​ test_bodhi.process(self.ref_input, self.ref_envdata)
158 158​
159 159​
Show All 22 Lines175 def test_action_download_insufficient_input_data(self):
182 test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji) 182​ test_bodhi = bodhi_directive.BodhiDirective(stub_bodhi, stub_koji)
183 183​
184 # Tests with no information 184​ # Tests with no information
185 with pytest.raises(TaskotronDirectiveError): 185​ with pytest.raises(TaskotronDirectiveError):
186 test_bodhi.process(ref_input, self.ref_envdata) 186​ test_bodhi.process(ref_input, self.ref_envdata)
187 187​
188 ref_input['arch'] = self.ref_arch 188​ ref_input['arch'] = self.ref_arch
189 189​
190 # Tests with only arch, or bodhi_id given 190​ # Tests with only arch, or update_id given
191 with pytest.raises(TaskotronDirectiveError): 191​ with pytest.raises(TaskotronDirectiveError):
192 test_bodhi.process(ref_input, self.ref_envdata) 192​ test_bodhi.process(ref_input, self.ref_envdata)
193 193​
194 ref_input.pop('arch') 194​ ref_input.pop('arch')
195 ref_input['bodhi_id'] = self.ref_bodhi_id 195​ ref_input['update_id'] = self.ref_update_id
196 196​
197 with pytest.raises(TaskotronDirectiveError): 197​ with pytest.raises(TaskotronDirectiveError):
198 test_bodhi.process(ref_input, self.ref_envdata) 198​ test_bodhi.process(ref_input, self.ref_envdata)
View Options

testing/test_bodhi_utils.py

1# -*- coding: utf-8 -*- 1​# -*- coding: utf-8 -*-
2# Copyright 2009-2014, Red Hat, Inc. 2​# Copyright 2009-2014, Red Hat, Inc.
3# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 3​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4# See the LICENSE file for more details on Licensing 4​# See the LICENSE file for more details on Licensing
5 5​
6'''Unit tests for libtaskotron/bodhi_utils.py''' 6​'''Unit tests for libtaskotron/bodhi_utils.py'''
7 7​
8import pytest 8​import pytest
9from dingus import Dingus 9​from dingus import Dingus
10from munch import Munch 10​from munch import Munch
11 11​
12import fedora.client.bodhi 12​import fedora.client.bodhi
13 13​
14from libtaskotron import bodhi_utils 14​from libtaskotron import bodhi_utils
15from libtaskotron import exceptions as exc 15​from libtaskotron import exceptions as exc
16​from libtaskotron import config
16 17​
17 18​
18class TestBodhiUtils(): 19​class TestBodhiUtils():
20​ '''Test generic functionality'''
21​
19 def test_nonetwork_on_creation(self, monkeypatch): 22​ def test_nonetwork_on_creation(self, monkeypatch):
20 '''It's important that our stuff not attempt to access the network 23​ '''It's important that our stuff not attempt to access the network
21 during init so that %check doesn't fail during package build. At one 24​ during init so that %check doesn't fail during package build. At one
22 point, BodhiClient did ping bodhi production during init, so let's make 25​ point, BodhiClient did ping bodhi production during init, so let's make
23 sure that doesn't happen''' 26​ sure that doesn't happen'''
24 27​
25 assert hasattr(fedora.client.bodhi, 'requests') 28​ assert hasattr(fedora.client.bodhi, 'requests')
26 stub_requests = Dingus() 29​ stub_requests = Dingus()
27 monkeypatch.setattr(fedora.client.bodhi, 'requests', stub_requests) 30​ monkeypatch.setattr(fedora.client.bodhi, 'requests', stub_requests)
28 31​
29 bu = bodhi_utils.BodhiUtils() 32​ bu = bodhi_utils.BodhiUtils()
30 assert bu.client is not None 33​ assert bu.client is not None
31 assert len(stub_requests.calls()) == 0 34​ assert len(stub_requests.calls()) == 0
32 35​
36​ def test_staging_or_production(self, monkeypatch):
37​ '''Client should be correctly created when requested staging in config or not'''
38​ monkeypatch.setattr(config, '_config', None)
39​ conf = config.get_config()
40​ assert conf.bodhi_staging is False
41​ bu = bodhi_utils.BodhiUtils()
42​ prod_url = bu.client.base_url
43​
44​ conf.bodhi_staging = True
45​ bu_stg = bodhi_utils.BodhiUtils()
46​ stg_url = bu_stg.client.base_url
47​
48​ assert prod_url != stg_url
49​ assert prod_url == fedora.client.bodhi.BODHI2_BASE_URL
50​ assert stg_url == fedora.client.bodhi.BODHI2_STG_BASE_URL
33 51​
34# FIXME: once query_update() does not throw NotImplementedError 52​
35# class TestQueryUpdate(): 53​class TestGetUpdate():
36# '''Test query_update()''' 54​ '''Test get_update()'''
37# 55​
38# def setup_method(self, method): 56​ def setup_method(self, method):
39# '''Run this before every test invocation''' 57​ '''Run this before every test invocation'''
40# self.ref_bodhi_id = 'FEDORA-1234-56789' 58​ self.ref_update_id = 'FEDORA-1234-56789'
41# self.ref_update = {'title': 'Random update', 59​ self.ref_update = {'title': 'Random update',
42# 'builds': [{'nvr': 'foo-1.2-3.fc99', 60​ 'builds': [{'nvr': 'foo-1.2-3.fc99',
43# 'package': {} 61​ 'package': {}
44# }], 62​ }],
45# 'other_keys': {}, 63​ 'other_keys': {},
46# } 64​ }
47# 65​
48# def test_query_existing_update(self): 66​ def test_query_existing_update(self):
49# '''Test query for existing update''' 67​ '''Test query for existing update'''
50# ref_query_answer = {'tg_flash': None, 68​ ref_query_answer = {'updates': [self.ref_update]}
51# 'num_items': 1, 69​ stub_bodhi = Dingus(query__returns=ref_query_answer)
52# 'title': '1 update found', 70​ bodhi = bodhi_utils.BodhiUtils(client=stub_bodhi)
53# 'updates': [self.ref_update], 71​ update = bodhi.get_update(self.ref_update_id)
54# } 72​
55# stub_bodhi = Dingus(query__returns=ref_query_answer) 73​ assert update == self.ref_update
56# bodhi = bodhi_utils.BodhiUtils(client=stub_bodhi) 74​
57# update = bodhi.query_update(self.ref_bodhi_id) 75​ def test_query_non_existing_update(self, monkeypatch):
58# 76​ '''Test query for non-existing update'''
59# assert update == self.ref_update 77​ ref_query_answer = {'updates': []}
60# 78​ stub_bodhi = Dingus(query__returns=ref_query_answer)
61# def test_query_non_existing_update(self, monkeypatch): 79​ bodhi = bodhi_utils.BodhiUtils(client=stub_bodhi)
62# '''Test query for non-existing update''' 80​ update = bodhi.get_update(self.ref_update_id)
63# ref_query_answer = {'tg_flash': None, 81​
64# 'num_items': 0, 82​ assert update is None
65# 'title': '0 updates found', ​
66# 'updates': [], ​
67# } ​
68# stub_bodhi = Dingus(query__returns=ref_query_answer) ​
69# bodhi = bodhi_utils.BodhiUtils(client=stub_bodhi) ​
70# update = bodhi.query_update(self.ref_bodhi_id) ​
71# ​
72# assert update is None ​
73 83​
74 84​
75@pytest.mark.usefixtures('setup') 85​@pytest.mark.usefixtures('setup')
76class TestBuild2Update(): 86​class TestBuild2Update():
77 '''Test build2update()''' 87​ '''Test build2update()'''
78 88​
79 # fake requests and responses for query_update() 89​ # fake requests and responses for query_update()
80 multi1 = Munch(builds=[Munch(nvr=u'multi1-a-1.0-1.fc20'), 90​ multi1 = Munch(builds=[Munch(nvr=u'multi1-a-1.0-1.fc20'),
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines