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

[IMP] runbot: clean imports from odoo.http

Browse Source 
In frontend.py, the whole odoo.http module is imported but request is
imported separately. This make it difficult to mock the different things
comming from http in tests.

With this commit, only the needed parts are imported from odoo.http.
This commit is contained in:
Christophe Monniez 2019-01-09 15:58:49 +01:00
parent 989513801a
commit 84e6be84ad
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runbot/controllers/frontend.py
View File

@ -3,14 +3,13 @@ import operator
import werkzeug import werkzeug
from collections import OrderedDict from collections import OrderedDict
from odoo import http
from odoo.addons.http_routing.models.ir_http import slug from odoo.addons.http_routing.models.ir_http import slug
from odoo.addons.website.controllers.main import QueryURL from odoo.addons.website.controllers.main import QueryURL
from odoo.http import request from odoo.http import Controller, request, route
from ..common import uniq_list, flatten, s2human from ..common import uniq_list, flatten, s2human
class Runbot(http.Controller): class Runbot(Controller):
def build_info(self, build): def build_info(self, build):
real_build = build.duplicate_id if build.state == 'duplicate' else build real_build = build.duplicate_id if build.state == 'duplicate' else build
@ -47,7 +46,7 @@ class Runbot(http.Controller):
level = ['info', 'warning', 'danger'][int(count > warn) + int(count > crit)] level = ['info', 'warning', 'danger'][int(count > warn) + int(count > crit)]
return count, level return count, level
@http.route(['/runbot', '/runbot/repo/<model("runbot.repo"):repo>'], website=True, auth='public', type='http') @route(['/runbot', '/runbot/repo/<model("runbot.repo"):repo>'], website=True, auth='public', type='http')
def repo(self, repo=None, search='', limit='100', refresh='', **kwargs): def repo(self, repo=None, search='', limit='100', refresh='', **kwargs):
branch_obj = request.env['runbot.branch'] branch_obj = request.env['runbot.branch']
build_obj = request.env['runbot.build'] build_obj = request.env['runbot.build']
@ -152,21 +151,21 @@ class Runbot(http.Controller):
'testing': build_obj.search_count([('state', '=', 'testing'), ('host', '=', result['host'])]), 'testing': build_obj.search_count([('state', '=', 'testing'), ('host', '=', result['host'])]),
'running': build_obj.search_count([('state', '=', 'running'), ('host', '=', result['host'])]), 'running': build_obj.search_count([('state', '=', 'running'), ('host', '=', result['host'])]),
}) })
return http.request.render('runbot.repo', context) return request.render('runbot.repo', context)
@http.route(['/runbot/build/<int:build_id>/kill'], type='http', auth="user", methods=['POST'], csrf=False) @route(['/runbot/build/<int:build_id>/kill'], type='http', auth="user", methods=['POST'], csrf=False)
def build_ask_kill(self, build_id, search=None, **post): def build_ask_kill(self, build_id, search=None, **post):
build = request.env['runbot.build'].sudo().browse(build_id) build = request.env['runbot.build'].sudo().browse(build_id)
build._ask_kill() build._ask_kill()
return werkzeug.utils.redirect('/runbot/repo/%s' % build.repo_id.id + ('?search=%s' % search if search else '')) return werkzeug.utils.redirect('/runbot/repo/%s' % build.repo_id.id + ('?search=%s' % search if search else ''))
@http.route(['/runbot/build/<int:build_id>/force'], type='http', auth="public", methods=['POST'], csrf=False) @route(['/runbot/build/<int:build_id>/force'], type='http', auth="public", methods=['POST'], csrf=False)
def build_force(self, build_id, search=None, **post): def build_force(self, build_id, search=None, **post):
build = request.env['runbot.build'].sudo().browse(build_id) build = request.env['runbot.build'].sudo().browse(build_id)
build._force() build._force()
return werkzeug.utils.redirect('/runbot/repo/%s' % build.repo_id.id + ('?search=%s' % search if search else '')) return werkzeug.utils.redirect('/runbot/repo/%s' % build.repo_id.id + ('?search=%s' % search if search else ''))
@http.route(['/runbot/build/<int:build_id>'], type='http', auth="public", website=True) @route(['/runbot/build/<int:build_id>'], type='http', auth="public", website=True)
def build(self, build_id, search=None, **post): def build(self, build_id, search=None, **post):
"""Events/Logs""" """Events/Logs"""
@ -203,7 +202,7 @@ class Runbot(http.Controller):
} }
return request.render("runbot.build", context) return request.render("runbot.build", context)
@http.route(['/runbot/b/<branch_name>', '/runbot/<model("runbot.repo"):repo>/<branch_name>'], type='http', auth="public", website=True) @route(['/runbot/b/<branch_name>', '/runbot/<model("runbot.repo"):repo>/<branch_name>'], type='http', auth="public", website=True)
def fast_launch(self, branch_name=False, repo=False, **post): def fast_launch(self, branch_name=False, repo=False, **post):
"""Connect to the running Odoo instance""" """Connect to the running Odoo instance"""
Build = request.env['runbot.build'] Build = request.env['runbot.build']
@ -238,7 +237,7 @@ class Runbot(http.Controller):
return request.not_found() return request.not_found()
return werkzeug.utils.redirect(url) return werkzeug.utils.redirect(url)
@http.route(['/runbot/dashboard'], type='http', auth="public", website=True) @route(['/runbot/dashboard'], type='http', auth="public", website=True)
def dashboard(self, refresh=None): def dashboard(self, refresh=None):
cr = request.cr cr = request.cr
RB = request.env['runbot.build'] RB = request.env['runbot.build']
@ -297,7 +296,7 @@ class Runbot(http.Controller):
return request.render("runbot.sticky-dashboard", qctx) return request.render("runbot.sticky-dashboard", qctx)
@http.route('/runbot/glances', type='http', auth='public', website=True) @route('/runbot/glances', type='http', auth='public', website=True)
def glances(self, refresh=None): def glances(self, refresh=None):
repos = request.env['runbot.repo'].search([]) # respect record rules repos = request.env['runbot.repo'].search([]) # respect record rules
query = """ query = """
@ -333,7 +332,7 @@ class Runbot(http.Controller):
} }
return request.render("runbot.glances", qctx) return request.render("runbot.glances", qctx)
@http.route(['/runbot/branch/<int:branch_id>', '/runbot/branch/<int:branch_id>/page/<int:page>'], website=True, auth='public', type='http') @route(['/runbot/branch/<int:branch_id>', '/runbot/branch/<int:branch_id>/page/<int:page>'], website=True, auth='public', type='http')
def branch_builds(self, branch_id=None, search='', page=1, limit=50, refresh='', **kwargs): def branch_builds(self, branch_id=None, search='', page=1, limit=50, refresh='', **kwargs):
""" list builds of a runbot branch """ """ list builds of a runbot branch """
builds_count = request.env['runbot.build'].search_count([('branch_id','=',branch_id)]) builds_count = request.env['runbot.build'].search_count([('branch_id','=',branch_id)])