| tflink |
Fixes T118
Tests included
| Lint Skipped |
| Unit Tests Skipped |
The real test will be to see what happens when we start using it but looks good to me.
| Path | |||
|---|---|---|---|
| M | fake_fedorainfra.spec (1 line) | ||
| M | fake_fedorainfra/controllers/main.py (58 lines) | ||
| M | requirements.txt (1 line) | ||
| M | setup.py (1 line) | ||
| M | testing/testfunc_bodhi.py (68 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 1dcf2859bb74 | 581f84473fe7 | 3d47b0122ac3 | Martin Krizek | Improve bodhi error handling (Show More…) | Apr 10 2014, 3:20 PM |
| Show All 17 Lines | |||||
| 18 | Source0: https://bitbucket.org/fedoraqa/fake_fedorainfra-%{version}.tar.gz | 18 | Source0: https://bitbucket.org/fedoraqa/fake_fedorainfra-%{version}.tar.gz | ||
| 19 | 19 | | |||
| 20 | BuildArch: noarch | 20 | BuildArch: noarch | ||
| 21 | 21 | | |||
| 22 | Requires: python-flask | 22 | Requires: python-flask | ||
| 23 | Requires: python-flask-sqlalchemy | 23 | Requires: python-flask-sqlalchemy | ||
| 24 | Requires: python-flask-wtf | 24 | Requires: python-flask-wtf | ||
| 25 | Requires: python-flask-login | 25 | Requires: python-flask-login | ||
| 26 | Requires: python-fedora | ||||
| 26 | BuildRequires: python2-devel | 27 | BuildRequires: python2-devel | ||
| 27 | BuildRequires: python-setuptools | 28 | BuildRequires: python-setuptools | ||
| 28 | 29 | | |||
| 29 | %description | 30 | %description | ||
| 30 | This is a partial implementation of the Fedora infrastructure to use for | 31 | This is a partial implementation of the Fedora infrastructure to use for | ||
| 31 | testing without needing to actually set up instances of all the services. | 32 | testing without needing to actually set up instances of all the services. | ||
| 32 | 33 | | |||
| 33 | %prep | 34 | %prep | ||
| Show All 36 Lines | |||||
| Show All 12 Lines | |||||
| 13 | # You should have received a copy of the GNU General Public License along | 13 | # You should have received a copy of the GNU General Public License along | ||
| 14 | # with this program; if not, write to the Free Software Foundation, Inc., | 14 | # with this program; if not, write to the Free Software Foundation, Inc., | ||
| 15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 16 | # | 16 | # | ||
| 17 | # Authors: | 17 | # Authors: | ||
| 18 | # Josef Skladanka <jskladan@redhat.com> | 18 | # Josef Skladanka <jskladan@redhat.com> | ||
| 19 | 19 | | |||
| 20 | from flask import Blueprint | 20 | from flask import Blueprint | ||
| 21 | from flask import request, url_for, render_template, flash, redirect | 21 | from flask import request, url_for, render_template, flash, redirect, abort | ||
| 22 | from fake_fedorainfra import app, db | 22 | from fake_fedorainfra import app, db | ||
| 23 | 23 | | |||
| 24 | import fedora.client | ||||
| 25 | | ||||
| 24 | main = Blueprint('main', __name__) | 26 | main = Blueprint('main', __name__) | ||
| 25 | 27 | | |||
| 26 | 28 | | |||
| 27 | from datetime import datetime | 29 | from datetime import datetime | ||
| 28 | import json | 30 | import json | ||
| 29 | from sqlalchemy import desc | 31 | from sqlalchemy import desc | ||
| 30 | from fake_fedorainfra.models.bodhi import BodhiComment | 32 | from fake_fedorainfra.models.bodhi import BodhiComment | ||
| 31 | from fake_fedorainfra.lib import util | 33 | from fake_fedorainfra.lib import util | ||
| Show All 16 Lines | 44 | def bodhi_comment(): | |||
| 48 | return json.dumps(default_response) | 50 | return json.dumps(default_response) | ||
| 49 | 51 | | |||
| 50 | @app.route('/bodhi/list', methods=['POST','GET']) | 52 | @app.route('/bodhi/list', methods=['POST','GET']) | ||
| 51 | def bodhi_list(): | 53 | def bodhi_list(): | ||
| 52 | # we need username, release, package, request, status, type_, bugs, mine | 54 | # we need username, release, package, request, status, type_, bugs, mine | ||
| 53 | user= release= package= bodhirequest= status= update_type= bugs= mine = None | 55 | user= release= package= bodhirequest= status= update_type= bugs= mine = None | ||
| 54 | limit = 10 | 56 | limit = 10 | ||
| 55 | 57 | | |||
| 56 | if 'username' in request.form.keys(): | 58 | if 'username' in request.values.keys(): | ||
| 57 | user = str(request.form['username']) | 59 | user = str(request.values['username']) | ||
| 58 | if 'release' in request.form.keys(): | 60 | if 'release' in request.values.keys(): | ||
| 59 | release = str(request.form['release']) | 61 | release = str(request.values['release']) | ||
| 60 | if 'package' in request.form.keys(): | 62 | if 'package' in request.values.keys(): | ||
| 61 | package = str(request.form['package']) | 63 | package = str(request.values['package']) | ||
| 62 | if 'request' in request.form.keys(): | 64 | if 'request' in request.values.keys(): | ||
| 63 | bodhirequest = str(request.form['request']) | 65 | bodhirequest = str(request.values['request']) | ||
| 64 | if 'status' in request.form.keys(): | 66 | if 'status' in request.values.keys(): | ||
| 65 | status = str(request.form['status']) | 67 | status = str(request.values['status']) | ||
| 66 | if 'type_' in request.form.keys(): | 68 | if 'type_' in request.values.keys(): | ||
| 67 | update_type = str(request.form['type_']) | 69 | update_type = str(request.values['type_']) | ||
| 68 | if 'bugs' in request.form.keys(): | 70 | if 'bugs' in request.values.keys(): | ||
| 69 | bugs = request.form['bugs'] | 71 | bugs = request.values['bugs'] | ||
| 70 | if 'mine' in request.form.keys(): | 72 | if 'mine' in request.values.keys(): | ||
| 71 | mine = str(request.form['mine']) | 73 | mine = str(request.values['mine']) | ||
| 72 | if 'tg_paginate_limit' in request.form.keys(): | 74 | if 'tg_paginate_limit' in request.values.keys(): | ||
| 73 | limit = int(request.form['tg_paginate_limit']) | 75 | limit = int(request.values['tg_paginate_limit']) | ||
| 74 | 76 | | |||
| 75 | bodhi = get_bodhi_connection() | 77 | try: | ||
| 76 | result = bodhi.query(package=package, limit=limit, username=user, | 78 | bodhi = get_bodhi_connection() | ||
| 77 | release=release, request=bodhirequest, status=status, | 79 | result = bodhi.query(package=package, limit=limit, username=user, | ||
| 78 | type_=update_type, bugs=bugs, mine=mine).toDict() | 80 | release=release, request=bodhirequest, status=status, | ||
| 81 | type_=update_type, bugs=bugs, mine=mine) | ||||
| 82 | except fedora.client.AuthError, e: | ||||
| 83 | app.logger.exception('bodhi AuthError') | ||||
| 84 | abort(401) | ||||
| 85 | except fedora.client.ServerError, e: | ||||
| 86 | app.logger.exception('bodhi ServerError') | ||||
| 87 | abort(int(e.code)) | ||||
| 88 | | ||||
| 79 | for update in result['updates']: | 89 | for update in result['updates']: | ||
| 80 | raw_comments = search_comments(update['title']) | 90 | raw_comments = search_comments(update['title']) | ||
| 81 | comments = [dict(timestamp=row['date'], update=row['update'] ,text=row['text'], author=row['user'], | 91 | comments = [dict(timestamp=row['date'], update=row['update'] ,text=row['text'], author=row['user'], | ||
| 82 | karma=row['karma'], anonymous=False, group=None) for row in raw_comments] | 92 | karma=row['karma'], anonymous=False, group=None) for row in raw_comments] | ||
| 83 | update['comments'] = comments | 93 | update['comments'] = comments | ||
| 84 | return json.dumps(result) | 94 | return json.dumps(result) | ||
| 85 | 95 | | |||
| 86 | def search_comments(update): | 96 | def search_comments(update): | ||
| ▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines | |||||
| 1 | pytest>=2.0.3 | 1 | pytest>=2.0.3 | ||
|---|---|---|---|---|---|
| 2 | Flask==0.9 | 2 | Flask==0.9 | ||
| 3 | Flask-XML-RPC>=0.1.2 | 3 | Flask-XML-RPC>=0.1.2 | ||
| 4 | SQLAlchemy>= 0.7 | 4 | SQLAlchemy>= 0.7 | ||
| 5 | Flask-SQLAlchemy==0.16 | 5 | Flask-SQLAlchemy==0.16 | ||
| 6 | WTForms>1.0 | 6 | WTForms>1.0 | ||
| 7 | Flask-WTF==0.8 | 7 | Flask-WTF==0.8 | ||
| 8 | Flask-Login>=0.1.3 | 8 | Flask-Login>=0.1.3 | ||
| 9 | python-fedora>=0.3.33 | ||||
| 9 | 10 | | |||
| Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s) | 42 | install_requires = [ | |||
|---|---|---|---|---|---|
| 43 | 'pytest>=2.0.3', | 43 | 'pytest>=2.0.3', | ||
| 44 | 'Flask==0.9', | 44 | 'Flask==0.9', | ||
| 45 | 'Flask-SQLAlchemy==0.16', | 45 | 'Flask-SQLAlchemy==0.16', | ||
| 46 | 'SQLAlchemy>= 0.7', | 46 | 'SQLAlchemy>= 0.7', | ||
| 47 | 'MySQL-python >= 1.2.0', | 47 | 'MySQL-python >= 1.2.0', | ||
| 48 | 'WTForms>1.0', | 48 | 'WTForms>1.0', | ||
| 49 | 'Flask-WTF==0.8', | 49 | 'Flask-WTF==0.8', | ||
| 50 | 'Flask-Login>=0.1.3', | 50 | 'Flask-Login>=0.1.3', | ||
| 51 | 'python-fedora>=0.3.33', | ||||
| 51 | ] | 52 | ] | ||
| 52 | ) | 53 | ) | ||
| 53 | 54 | | |||
| 54 | 55 | | |||
| 55 | #FIXME: change Flask-WTF to >= 0.8 (?) there seems to be a bug now (see below), or it might be connected to the Flask version - find out! | 56 | #FIXME: change Flask-WTF to >= 0.8 (?) there seems to be a bug now (see below), or it might be connected to the Flask version - find out! | ||
| 56 | # File "/home/jskladan/flask_virtualenv/lib/python2.7/site-packages/Flask_WTF-0.9.0-py2.7.egg/flask_wtf/recaptcha/widgets.py", line 5, in <module> | 57 | # File "/home/jskladan/flask_virtualenv/lib/python2.7/site-packages/Flask_WTF-0.9.0-py2.7.egg/flask_wtf/recaptcha/widgets.py", line 5, in <module> | ||
| 57 | # from flask.json import dumps, JSONEncoder | 58 | # from flask.json import dumps, JSONEncoder | ||
| 1 | # | 1 | # | ||
|---|---|---|---|---|---|
| 2 | # testfunc_bodhi.py - functional tests for the bodhi portion of boji | 2 | # testfunc_bodhi.py - functional tests for the bodhi portion of boji | ||
| 3 | # | 3 | # | ||
| 4 | # Copyright 2011, Red Hat, Inc. | 4 | # Copyright 2011-2014, Red Hat, Inc. | ||
| 5 | # | 5 | # | ||
| 6 | # This program is free software; you can redistribute it and/or modify | 6 | # This program is free software; you can redistribute it and/or modify | ||
| 7 | # it under the terms of the GNU General Public License as published by | 7 | # it under the terms of the GNU General Public License as published by | ||
| 8 | # the Free Software Foundation; either version 2 of the License, or | 8 | # the Free Software Foundation; either version 2 of the License, or | ||
| 9 | # (at your option) any later version. | 9 | # (at your option) any later version. | ||
| 10 | # | 10 | # | ||
| 11 | # This program is distributed in the hope that it will be useful, | 11 | # This program is distributed in the hope that it will be useful, | ||
| 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | # GNU General Public License for more details. | 14 | # GNU General Public License for more details. | ||
| 15 | # | 15 | # | ||
| 16 | # You should have received a copy of the GNU General Public License along | 16 | # You should have received a copy of the GNU General Public License along | ||
| 17 | # with this program; if not, write to the Free Software Foundation, Inc., | 17 | # with this program; if not, write to the Free Software Foundation, Inc., | ||
| 18 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 19 | # | 19 | # | ||
| 20 | # Author: Tim Flink <tflink@redhat.com> | 20 | # Authors: | ||
| 21 | # Tim Flink <tflink@redhat.com> | ||||
| 22 | # Martin Krizek <mkrizek@redhat.com> | ||||
| 21 | 23 | | |||
| 22 | import pytest | 24 | import pytest | ||
| 23 | import bunch | 25 | import bunch | ||
| 24 | import json | 26 | import json | ||
| 27 | import tempfile | ||||
| 28 | | ||||
| 29 | from fedora.client import AuthError, ServerError | ||||
| 30 | | ||||
| 25 | import fake_fedorainfra | 31 | import fake_fedorainfra | ||
| 26 | import fake_fedorainfra.cli | 32 | import fake_fedorainfra.cli | ||
| 27 | import fake_fedorainfra.controllers.main | 33 | import fake_fedorainfra.controllers.main | ||
| 28 | import tempfile | 34 | from fake_fedorainfra.lib import util | ||
| 29 | from fake_fedorainfra import util | | |||
| 30 | 35 | | |||
| 31 | 36 | | |||
| 32 | class MockBodhi(): | 37 | def query(*args, **kwargs): | ||
| 33 | def __init__(self, update): | 38 | return bunch.Bunch(util.make_default_update()) | ||
| 34 | self.update = update | | |||
| 35 | 39 | | |||
| 36 | def query(self, package, limit): | | |||
| 37 | return bunch.Bunch(self.update) | | |||
| 38 | 40 | | |||
| 39 | def get_mock_bodhi(): | 41 | def query_raise_server_error(*args, **kwargs): | ||
| 40 | return MockBodhi(util.make_default_update()) | 42 | raise ServerError('some_url', '404', 'Not Found') | ||
| 41 | 43 | | |||
| 42 | @classmethod | | |||
| 43 | def setup_class(cls): | | |||
| 44 | cls.setup() | | |||
| 45 | 44 | | |||
| 46 | class TestFuncBodhi(): | 45 | def query_raise_auth_error(*args, **kwargs): | ||
| 46 | raise AuthError('some_url') | ||||
| 47 | | ||||
| 47 | 48 | | |||
| 48 | def setup(self): | 49 | class TestFuncBodhi(): | ||
| 50 | def setup_method(self, method): | ||||
| 49 | self.db_fd, fake_fedorainfra.app.config['DATABASE'] = tempfile.mkstemp() | 51 | self.db_fd, fake_fedorainfra.app.config['DATABASE'] = tempfile.mkstemp() | ||
| 50 | print "tempfiledb: %s" % fake_fedorainfra.app.config['DATABASE'] | 52 | print "tempfiledb: %s" % fake_fedorainfra.app.config['DATABASE'] | ||
| 51 | fake_fedorainfra.db.db_url = 'file://%s' % self.db_fd | 53 | fake_fedorainfra.db.db_url = 'file://%s' % self.db_fd | ||
| 52 | self.app = fake_fedorainfra.app.test_client() | 54 | self.app = fake_fedorainfra.app.test_client() | ||
| 53 | fake_fedorainfra.cli.init_db() | 55 | fake_fedorainfra.cli.initialize_db() | ||
| 56 | | ||||
| 57 | def test_bodhi_server_error(self, monkeypatch): | ||||
| 58 | monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query_raise_server_error) | ||||
| 59 | monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) | ||||
| 54 | 60 | | |||
| 55 | def mock_bodhi_query(self, package, limit): | 61 | response = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) | ||
| 56 | print self.ref_query | | |||
| 57 | return json.dumps(self.ref_query) | | |||
| 58 | 62 | | |||
| 59 | def test_get_comment(self, monkeypatch): | 63 | assert response.status_code == 404 | ||
| 60 | self.ref_query = util.make_default_update() | 64 | | ||
| 65 | def test_bodhi_auth_error(self, monkeypatch): | ||||
| 66 | monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query_raise_auth_error) | ||||
| 67 | monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) | ||||
| 61 | 68 | | |||
| 62 | monkeypatch.setattr(fake_fedorainfra.controllers.main, 'get_bodhi_connection', get_mock_bodhi) | 69 | response = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) | ||
| 70 | | ||||
| 71 | assert response.status_code == 401 | ||||
| 72 | | ||||
| 73 | def test_get_comment(self, monkeypatch): | ||||
| 74 | monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query) | ||||
| 63 | monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) | 75 | monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) | ||
| 64 | 76 | | |||
| 65 | test_result = self.app.post('/bodhi/list', data={'package':'foo', 'limit':10}) | 77 | test_result = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) | ||
| 66 | 78 | | |||
| 67 | test_comments = json.loads(test_result.data)['updates'][0]['comments'] | 79 | test_comments = json.loads(test_result.data)['updates'][0]['comments'] | ||
| 68 | assert len(test_comments) == 0 | 80 | assert len(test_comments) == 0 | ||
| 69 | 81 | | |||
| 70 | def test_make_comment(self, monkeypatch): | 82 | def test_make_comment(self, monkeypatch): | ||
| 71 | ref_user = 'nobody' | 83 | ref_user = 'nobody' | ||
| 72 | ref_title = 'nothing-1.2.3-4.fc99' | 84 | ref_title = 'nothing-1.2.3-4.fc99' | ||
| 73 | ref_comment = 'this is a random comment' | 85 | ref_comment = 'this is a random comment' | ||
| 74 | 86 | | |||
| 75 | monkeypatch.setattr(fake_fedorainfra.controllers.main, 'get_bodhi_connection', get_mock_bodhi) | 87 | monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query) | ||
| 76 | monkeypatch.setattr(fake_fedorainfra.ddb, 'db_url', 'file://%s' % self.db_fd) | 88 | monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) | ||
| 77 | 89 | | |||
| 78 | test_result = self.app.post('/bodhi/comment', data={'title':ref_title, 'text': ref_comment, 'user_name': ref_user, 'karma':0, 'email': 'False', 'password': 'password' }) | 90 | test_result = self.app.post('/bodhi/comment', data={'title':ref_title, 'text': ref_comment, 'user_name': ref_user, 'karma':0, 'email': 'False', 'password': 'password'}) | ||
| 79 | 91 | | |||
| 80 | test_comments = json.loads(self.app.post('/bodhi/list', data={'package': ref_title, 'limit':10}).data)['updates'] | 92 | test_comments = json.loads(self.app.post('/bodhi/list', data={'package': ref_title, 'tg_paginate_limit': 10}).data)['updates'] | ||
| 81 | 93 | | |||
| 82 | assert len(test_comments) == 1 | 94 | assert len(test_comments) == 1 | ||
| 83 | assert len(test_comments[0]['comments']) == 1 | 95 | assert len(test_comments[0]['comments']) == 1 | ||
| 84 | assert test_comments[0]['comments'][0]['text'] == ref_comment | 96 | assert test_comments[0]['comments'][0]['text'] == ref_comment | ||