Differential D526

Update query() to Bodhi2, deprecate project
ClosedPublic
Actions

Authored by kparal on Aug 24 2015, 7:44 AM.

Details

Reviewers
lbrabec
tflink
jskladan
Maniphest Tasks
T583: Fix posting Bodhi comments
Commits
rFAKE2f6841eea107: Update query() to Bodhi2, deprecate project
Summary

Posting bodhi comments requires OpenID auth with Bodhi2, we've decided
it's not worth the time to try and mock this, since we're going to get
away from posting Bodhi comments very soon. Query operations have been
updated for Bodhi2.

This project is now deprecated, until revived in the future if such a
need arises.

Test Plan

one of the tests is broken (submitting comments)

Diff Detail

Repository
rFAKE fake_fedorainfra
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 Update query() to Bodhi2, deprecate project.Aug 24 2015, 7:44 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 1374.Aug 24 2015, 7:46 AM
  • remove login attempt fix leftover
jskladan accepted this revision.Aug 25 2015, 8:49 AM

I guess, that it's OK, although I don't really understand the purpose of the tool now - since we can't mock comments, just queries, wouldn't it be the same to use bodhi2 directly?

This revision is now accepted and ready to land.Aug 25 2015, 8:49 AM
kparal added a comment.Aug 25 2015, 10:05 AM
In D526#9926, @jskladan wrote:

I guess, that it's OK, although I don't really understand the purpose of the tool now - since we can't mock comments, just queries, wouldn't it be the same to use bodhi2 directly?

Have you seen the changes to the README? :) Since I already did some changes which made it partially compatible with Bodhi2, I didn't want to just throw them away, so I included them. But overall, the intention is to stop using this tool.

tflink accepted this revision.Aug 25 2015, 3:27 PM
Closed by commit rFAKE2f6841eea107: Update query() to Bodhi2, deprecate project (authored by kparal). · Explain WhyAug 26 2015, 8:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1390

View Options

README.rst

1fake_fedorainfra 1​fake_fedorainfra
2================ 2​================
3 3​
4A simple webapp which will allow to mock `Fedora Bodhi <https://admin.fedoraproject.org/updates/>`_ 4​**NOTE**: This project has been deprecated when Fedora switched to using
5​Bodhi2 (and respective python-fedora package update), which requires OpenID
6​authentication before performing write operations (submitting comments). Only
7​query operations are currently supported by fake_fedorainfra with Bodhi2.
8​We're trying to get away from submitting Bodhi comments in general, so fixing
9​this library was not deemed worth the time. This project might be revived in
10​the future if new Bodhi2 mocking needs arise or we need to mock other services
11​(e.g. Koji).
12​
13​----
14​
15​A simple webapp which will allow to mock `Fedora Bodhi <https://bodhi.fedoraproject.org/>`_
5for comment submit requests. Mostly to be used together with 16​for comment submit requests. Mostly to be used together with
6`libtaskotron <http://libtaskotron.readthedocs.org/>`_. 17​`libtaskotron <http://libtaskotron.readthedocs.org/>`_.
7 18​
8All Bodhi list (query) operations are forwarded to real Bodhi and the result is 19​All Bodhi list (query) operations are forwarded to real Bodhi and the result is
9passed back. The post comment operation is saved to a local database and not 20​passed back. The post comment operation is saved to a local database and not
10forwarded to the official instance. 21​forwarded to the official instance.
11 22​
12Quick development setup 23​Quick development setup
Show All 31 Lines
44configure libtaskotron to use *fake_fedorainfra* instead of real Bodhi. Edit 55​configure libtaskotron to use *fake_fedorainfra* instead of real Bodhi. Edit
45``/etc/taskotron/taskotron.yaml`` and set the following value:: 56​``/etc/taskotron/taskotron.yaml`` and set the following value::
46 57​
47 bodhi_server: http://localhost:5000/bodhi 58​ bodhi_server: http://localhost:5000/bodhi
48 59​
49You might also need to adjust ``reporting_enabled`` and ``report_to_bodhi``, 60​You might also need to adjust ``reporting_enabled`` and ``report_to_bodhi``,
50depending on your local settings. 61​depending on your local settings.
51 62​
63​If you don't have ``fas_username`` and ``fas_password`` filled out, you'll
64​need to do so (any value).
65​
52Running test suite 66​Running test suite
53------------------ 67​------------------
54 68​
55You can run this test suite with the following command:: 69​You can run this test suite with the following command::
56 70​
57 $ py.test --functional testing/ 71​ $ py.test --functional testing/
View Options

fake_fedorainfra.spec

1%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) 1​%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
2%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} 2​%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
3%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} 3​%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
4%endif 4​%endif
5 5​
6Name: fake_fedorainfra 6​Name: fake_fedorainfra
7Version: 0.2.4 7​Version: 0.2.4
8Release: 1%{?dist} 8​Release: 1%{?dist}
9Summary: Fake partial implementation of fedora infrastructure for testing 9​Summary: Fake partial implementation of fedora infrastructure for testing
10 10​
11License: GPLv2+ 11​License: GPLv2+
12URL: https://bitbucket.org/fedoraqa/fake_fedorainfra 12​URL: https://bitbucket.org/fedoraqa/fake_fedorainfra
13Source0: https://bitbucket.org/fedoraqa/fake_fedorainfra-%{version}.tar.gz 13​Source0: https://bitbucket.org/fedoraqa/fake_fedorainfra-%{version}.tar.gz
14 14​
15BuildArch: noarch 15​BuildArch: noarch
16 16​
17​Requires: python-fedora >= 0.5.5
17Requires: python-flask 18​Requires: python-flask
18Requires: python-flask-sqlalchemy 19​Requires: python-flask-sqlalchemy
19Requires: python-flask-wtf 20​Requires: python-flask-wtf
20Requires: python-flask-login 21​Requires: python-flask-login
21Requires: python-flask-xmlrpc 22​Requires: python-flask-xmlrpc
22BuildRequires: python2-devel 23​BuildRequires: python2-devel
23BuildRequires: python-setuptools 24​BuildRequires: python-setuptools
24 25​
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines
View Options

fake_fedorainfra/controllers/main.py

Show All 31 Lines
32from fake_fedorainfra.models.bodhi import BodhiComment 32​from fake_fedorainfra.models.bodhi import BodhiComment
33from fake_fedorainfra.lib import util 33​from fake_fedorainfra.lib import util
34 34​
35NUM_PAGE = app.config['NUM_PAGE'] 35​NUM_PAGE = app.config['NUM_PAGE']
36 36​
37default_response = util.make_default_update() 37​default_response = util.make_default_update()
38 38​
39def get_bodhi_connection(): 39​def get_bodhi_connection():
40 return fedora.client.bodhi.BodhiClient() 40​ return fedora.client.bodhi.Bodhi2Client()
41 ​
42 41​
43@app.route('/bodhi/comment', methods=['POST']) 42​@app.route('/bodhi/comment', methods=['POST'])
44def bodhi_comment(): 43​def bodhi_comment():
45 current_time = str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')) 44​ current_time = str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S'))
46 db.session.add(BodhiComment(current_time, str( request.form['title']), 45​ db.session.add(BodhiComment(current_time, str(request.form['update']),
47 str(request.form['text']), str(request.form['user_name']), 46​ str(request.form['text']), str(request.form['user_name']),
48 int(request.form['karma']), request.form['email'] in ['true', 'True'])) 47​ int(request.form['karma']), request.form['email'] in ['true', 'True']))
49 db.session.commit() 48​ db.session.commit()
50 return json.dumps(default_response) 49​ return json.dumps(default_response)
51 50​
52@app.route('/bodhi/list', methods=['POST','GET']) 51​@app.route('/bodhi/updates', methods=['POST','GET'])
53def bodhi_list(): 52​def bodhi_updates():
54 # we need username, release, package, request, status, type_, bugs, mine ​
55 user= release= package= bodhirequest= status= update_type= bugs= mine = None ​
56 limit = 10 ​
57 ​
58 if 'username' in request.values.keys(): ​
59 user = str(request.values['username']) ​
60 if 'release' in request.values.keys(): ​
61 release = str(request.values['release']) ​
62 if 'package' in request.values.keys(): ​
63 package = str(request.values['package']) ​
64 if 'request' in request.values.keys(): ​
65 bodhirequest = str(request.values['request']) ​
66 if 'status' in request.values.keys(): ​
67 status = str(request.values['status']) ​
68 if 'type_' in request.values.keys(): ​
69 update_type = str(request.values['type_']) ​
70 if 'bugs' in request.values.keys(): ​
71 bugs = request.values['bugs'] ​
72 if 'mine' in request.values.keys(): ​
73 mine = str(request.values['mine']) ​
74 if 'tg_paginate_limit' in request.values.keys(): ​
75 limit = int(request.values['tg_paginate_limit']) ​
76 ​
77 try: 53​ try:
78 bodhi = get_bodhi_connection() 54​ bodhi = get_bodhi_connection()
79 result = bodhi.query(package=package, limit=limit, username=user, 55​ kwargs = dict(request.values.items())
80 release=release, request=bodhirequest, status=status, 56​ app.logger.debug('Requested kwargs: %s', kwargs)
81 type_=update_type, bugs=bugs, mine=mine) 57​ result = bodhi.query(**kwargs)
82 except fedora.client.AuthError, e: 58​ except fedora.client.AuthError, e:
83 app.logger.exception('bodhi AuthError') 59​ app.logger.exception('bodhi AuthError')
84 abort(401) 60​ abort(401)
85 except fedora.client.ServerError, e: 61​ except fedora.client.ServerError, e:
86 app.logger.exception('bodhi ServerError') 62​ app.logger.exception('bodhi ServerError')
87 abort(int(e.code)) 63​ abort(int(e.code))
88 64​
89 for update in result['updates']: 65​ for update in result['updates']:
90 raw_comments = search_comments(update['title']) 66​ raw_comments = search_comments(update['title'])
91 comments = [dict(timestamp=row['date'], update=row['update'] ,text=row['text'], author=row['user'], 67​ comments = [dict(timestamp=row['date'], update=row['update'] ,text=row['text'],
92 karma=row['karma'], anonymous=False, group=None) for row in raw_comments] 68​ user=dict(name=row['user']), karma=row['karma'], anonymous=False,
69​ group=None) for row in raw_comments]
93 update['comments'] = comments 70​ update['comments'] = comments
94 return json.dumps(result) 71​
72​ return json.dumps(result, indent=2, sort_keys=True)
95 73​
96def search_comments(update): 74​def search_comments(update):
97 c = db.session.query(BodhiComment).filter(BodhiComment.title.like('%%%s%%' % update)).order_by(BodhiComment.id) 75​ c = db.session.query(BodhiComment).filter(BodhiComment.title.like('%%%s%%' % update)).order_by(BodhiComment.id)
98 comments = [dict(date=str(row.date), update=row.title, text=row.text, user=row.username, 76​ comments = [dict(date=str(row.date), update=row.title, text=row.text, user=row.username,
99 karma=row.karma, send_email=row.send_email, id=row.id) for row in c] 77​ karma=row.karma, send_email=row.send_email, id=row.id) for row in c]
100 return comments 78​ return comments
101 79​
102def get_comments(start=0, num_comments=NUM_PAGE): 80​def get_comments(start=0, num_comments=NUM_PAGE):
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)136def clear_db():
159 db.session.execute('delete from comments') 137​ db.session.execute('delete from comments')
160 db.session.commit() 138​ db.session.commit()
161 flash('Database was cleared') 139​ flash('Database was cleared')
162 return redirect(url_for('default_boji_comments')) 140​ return redirect(url_for('default_boji_comments'))
163 141​
164@app.route('/', methods = ['GET']) 142​@app.route('/', methods = ['GET'])
165def boji_landing(): 143​def boji_landing():
166 return redirect(url_for('boji_main')) 144​ return redirect(url_for('boji_main'))
167 ​
View Options

fake_fedorainfra/lib/util.py

1default_date = '2000-01-23 12:34:56' 1​default_date = '2000-01-23 12:34:56'
2 2​
3def make_comment(comment): 3​def make_comment(comment):
4 return {'group':None, 'karma':0, 'anonymous':False, 'author':'nobody', 'timestamp': default_date, 'text': comment} 4​ return {'group':None, 'karma':0, 'anonymous':False, 'user': {'name': 'nobody'},
5​ 'timestamp': default_date, 'text': comment}
5 6​
6def make_bug(bug_id, title): 7​def make_bug(bug_id, title):
7 return {'bz_id': bug_id, 'security': False, 'parent': True, 'title': title} 8​ return {'bz_id': bug_id, 'security': False, 'parent': True, 'title': title}
8 9​
9def make_update(builds, title, bugs, comments): 10​def make_update(builds, title, bugs, comments):
10 update = {'status': 'testing', 'close_bugs': False, 'request': None, 11​ update = {'status': 'testing', 'close_bugs': False, 'request': None,
11 'date_submitted': default_date, 'unstable_karma': -3, 'submitter': 'nobody', 12​ 'date_submitted': default_date, 'unstable_karma': -3, 'submitter': 'nobody',
12 'critpath': False, 'approved': None, 'stable_karma': 3, 13​ 'critpath': False, 'approved': None, 'stable_karma': 3,
Show All 12 Lines24 return {'nvr': '%s-%s' % (name, version), 'package': {'suggest_reboot':
25 'name': name}} 26​ 'name': name}}
26 27​
27def make_default_update(): 28​def make_default_update():
28 comments = [make_comment('random, useless comment'), make_comment('another random, useless comment')] 29​ comments = [make_comment('random, useless comment'), make_comment('another random, useless comment')]
29 bugs = [make_bug(123456, 'random bug titles are awesome')] 30​ bugs = [make_bug(123456, 'random bug titles are awesome')]
30 builds = [make_build('nothing', '1.2.3-4.fc99')] 31​ builds = [make_build('nothing', '1.2.3-4.fc99')]
31 updates = [make_update(builds, 'nothing-1.2.3-4.fc99', bugs, comments)] 32​ updates = [make_update(builds, 'nothing-1.2.3-4.fc99', bugs, comments)]
32 return make_query_response(updates) 33​ return make_query_response(updates)
33 ​
View Options

requirements.txt

1pytest>=2.0.3 1​pytest>=2.0.3
2Flask>=0.9 2​Flask>=0.9
3Flask-XML-RPC>=0.1.2 3​Flask-XML-RPC>=0.1.2
4SQLAlchemy>= 0.7 4​SQLAlchemy>= 0.7
5Flask-SQLAlchemy>=0.16 5​Flask-SQLAlchemy>=0.16
6WTForms>1.0 6​WTForms>1.0
7Flask-WTF>=0.8 7​Flask-WTF>=0.8
8Flask-Login>=0.1.3 8​Flask-Login>=0.1.3
9python-fedora>=0.3.33 9​python-fedora>=0.5.5
10bunch==1.0.1 10​bunch==1.0.1
View Options

testing/testfunc_bodhi.py

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Line(s)49class TestFuncBodhi():
50 def setup_method(self, method): 50​ def setup_method(self, method):
51 self.db_fd, fake_fedorainfra.app.config['DATABASE'] = tempfile.mkstemp() 51​ self.db_fd, fake_fedorainfra.app.config['DATABASE'] = tempfile.mkstemp()
52 print "tempfiledb: %s" % fake_fedorainfra.app.config['DATABASE'] 52​ print "tempfiledb: %s" % fake_fedorainfra.app.config['DATABASE']
53 fake_fedorainfra.db.db_url = 'file://%s' % self.db_fd 53​ fake_fedorainfra.db.db_url = 'file://%s' % self.db_fd
54 self.app = fake_fedorainfra.app.test_client() 54​ self.app = fake_fedorainfra.app.test_client()
55 fake_fedorainfra.cli.initialize_db() 55​ fake_fedorainfra.cli.initialize_db()
56 56​
57 def test_bodhi_server_error(self, monkeypatch): 57​ def test_bodhi_server_error(self, monkeypatch):
58 monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query_raise_server_error) 58​ monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.Bodhi2Client, 'query', query_raise_server_error)
59 monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) 59​ monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd)
60 60​
61 response = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) 61​ response = self.app.post('/bodhi/updates', data={'packages':'foo', 'tg_paginate_limit': 10})
62 62​
63 assert response.status_code == 404 63​ assert response.status_code == 404
64 64​
65 def test_bodhi_auth_error(self, monkeypatch): 65​ def test_bodhi_auth_error(self, monkeypatch):
66 monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query_raise_auth_error) 66​ monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.Bodhi2Client, 'query', query_raise_auth_error)
67 monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) 67​ monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd)
68 68​
69 response = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) 69​ response = self.app.post('/bodhi/updates', data={'packages':'foo', 'tg_paginate_limit': 10})
70 70​
71 assert response.status_code == 401 71​ assert response.status_code == 401
72 72​
73 def test_get_comment(self, monkeypatch): 73​ def test_get_comment(self, monkeypatch):
74 monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query) 74​ monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.Bodhi2Client, 'query', query)
75 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)
76 76​
77 test_result = self.app.post('/bodhi/list', data={'package':'foo', 'tg_paginate_limit': 10}) 77​ test_result = self.app.post('/bodhi/updates', data={'packages':'foo', 'tg_paginate_limit': 10})
78 78​
79 test_comments = json.loads(test_result.data)['updates'][0]['comments'] 79​ test_comments = json.loads(test_result.data)['updates'][0]['comments']
80 assert len(test_comments) == 0 80​ assert len(test_comments) == 0
81 81​
82 def test_make_comment(self, monkeypatch): 82​ def test_make_comment(self, monkeypatch):
83 ref_user = 'nobody' 83​ ref_user = 'nobody'
84 ref_title = 'nothing-1.2.3-4.fc99' 84​ ref_title = 'nothing-1.2.3-4.fc99'
85 ref_comment = 'this is a random comment' 85​ ref_comment = 'this is a random comment'
86 86​
87 monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.BodhiClient, 'query', query) 87​ monkeypatch.setattr(fake_fedorainfra.controllers.main.fedora.client.bodhi.Bodhi2Client, 'query', query)
88 monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd) 88​ monkeypatch.setattr(fake_fedorainfra.db, 'db_url', 'file://%s' % self.db_fd)
89 89​
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'}) 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'})
91 91​
92 test_comments = json.loads(self.app.post('/bodhi/list', data={'package': ref_title, 'tg_paginate_limit': 10}).data)['updates'] 92​ test_comments = json.loads(self.app.post('/bodhi/updates', data={'packages': ref_title, 'tg_paginate_limit': 10}).data)['updates']
93 93​
94 assert len(test_comments) == 1 94​ assert len(test_comments) == 1
95 assert len(test_comments[0]['comments']) == 1 95​ assert len(test_comments[0]['comments']) == 1
96 assert test_comments[0]['comments'][0]['text'] == ref_comment 96​ assert test_comments[0]['comments'][0]['text'] == ref_comment