NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: allow to retry to send a status

Browse Source 
When a status cannot be sent to github, the status is created in
database but the `sent_date` field is not set.

Because of that, the status cannot be sent manually from the frontend.

With this commit, that kind of status can by tried again.
This commit is contained in:
Christophe Monniez 2021-02-01 08:21:26 +01:00
parent 4f4005896c
commit f28485b6a8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot/controllers/frontend.py
View File

@ -252,7 +252,7 @@ class Runbot(Controller):
last_status = CommitStatus.search([('commit_id', '=', status.commit_id.id), ('context', '=', status.context)], order='id desc', limit=1)
if status != last_status:
raise Forbidden("Only the last status can be resent")
if last_status.sent_date and (datetime.datetime.now() - last_status.sent_date).seconds > 60: # ensure at least 60sec between two resend
if not last_status.sent_date or (datetime.datetime.now() - last_status.sent_date).seconds > 60: # ensure at least 60sec between two resend
new_status = status.sudo().copy()
new_status.description = 'Status resent by %s' % request.env.user.name
new_status._send()

16
runbot/tests/test_commit.py
View File

@ -48,10 +48,7 @@ class TestCommitStatus(HttpCase):
self.assertEqual(parsed_response.path, '/web/login')
# 2. test that a simple Odoo user cannot resend a status
self.authenticate('simple', 'simple')
with mute_logger('odoo.addons.http_routing.models.ir_http'):
response = self.url_open('/runbot/commit/resend/%s' % commit_status.id)
# TODO remove or fix since the 'runbot.group_user' has been given to the 'base.group_user'.
# removed since the 'runbot.group_user' has been given to the 'base.group_user'.
# self.assertEqual(response.status_code, 403)
# 3. test that a non-existsing commit_status returns a 404
@ -64,7 +61,16 @@ class TestCommitStatus(HttpCase):
response = self.url_open('/runbot/commit/resend/%s' % non_existing_id)
self.assertEqual(response.status_code, 404)
# 4. Finally test that a new status is created on resend and that the _send method is called
#4.1 Test that a status not sent (with not sent_date) can be manually resend
with patch('odoo.addons.runbot.models.commit.CommitStatus._send') as send_patcher:
response = self.url_open('/runbot/commit/resend/%s' % commit_status.id)
self.assertEqual(response.status_code, 200)
send_patcher.assert_called()
commit_status = self.env['runbot.commit.status'].search([], order='id desc', limit=1)
self.assertEqual(commit_status.description, 'Status resent by runbot_admin')
# 4.2 Finally test that a new status is created on resend and that the _send method is called
with patch('odoo.addons.runbot.models.commit.CommitStatus._send') as send_patcher:
a_minute_ago = datetime.datetime.now() - datetime.timedelta(seconds=65)
commit_status.sent_date = a_minute_ago