Differential D507

update blockerbugs to work with bodhi2 api client. Fixes T569
ClosedPublic
Actions

Authored by tflink on Aug 18 2015, 6:22 PM.

Details

Reviewers
roshi
Maniphest Tasks
T569: prepare blockerbugs to work with bodhi 2.0
Commits
rBLKR113332ffab98: update blockerbugs to work with bodhi2 api client. Fixes T569
Summary

fixing the way that we're using the bodhi api client to work with bodhi 2.0, query methods and some error handling have changed

Test Plan

tests have been updated and pass. due to how old the data is in partner-bugzilla and the snapshot in bodhi.stg not having new stuff, can't really test before deployment. this shouldn't explode, though and I think we'll be able to fix other problems if/when we find them

Diff Detail

Repository
rBLKR blockerbugs
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
tflink retitled this revision from to update blockerbugs to work with bodhi2 api client. Fixes T569.Aug 18 2015, 6:22 PM
tflink updated this object.
tflink edited the test plan for this revision. (Show Details)
tflink added a subscriber: mkrizek.
roshi accepted this revision.Aug 18 2015, 7:13 PM

These changes look sane to me. (With the caveat Tim mentioned above, that this is hard to actually test w/o live production data)

This revision is now accepted and ready to land.Aug 18 2015, 7:13 PM
Closed by commit rBLKR113332ffab98: update blockerbugs to work with bodhi2 api client. Fixes T569 (authored by tflink). · Explain WhyAug 18 2015, 10:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1337

View Options

blockerbugs/util/update_sync.py

Show All 29 Lines
30 30​
31bodhi_baseurl = app.config['BODHI_URL'] 31​bodhi_baseurl = app.config['BODHI_URL']
32 32​
33 33​
34class UpdateSync(object): 34​class UpdateSync(object):
35 def __init__(self, db, bodhi_interface=None): 35​ def __init__(self, db, bodhi_interface=None):
36 self.db = db 36​ self.db = db
37 if bodhi_interface: 37​ if bodhi_interface:
38 self.bodhi_interface = bodhi_interface 38​ self.bodhi_interface = bodhi_interface()
39 else: 39​ else:
40 self.bodhi_interface = bodhi.BodhiClient(base_url=bodhi_baseurl) 40​ self.bodhi_interface = bodhi.BodhiClient(base_url=bodhi_baseurl)
41 self.log = logging.getLogger('update_sync') 41​ self.log = logging.getLogger('update_sync')
42 42​
43 def extract_information(self, update): 43​ def extract_information(self, update):
44 updateinfo = {} 44​ updateinfo = {}
45 date_pushed = None 45​ date_pushed = None
46 if update.date_pushed: 46​ if update.date_pushed:
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s)99 def clean_updates(self, updates):
104 104​
105 for update in query_updates: 105​ for update in query_updates:
106 if update.title in deleted_updates: 106​ if update.title in deleted_updates:
107 update.status = 'deleted' 107​ update.status = 'deleted'
108 self.db.session.add(update) 108​ self.db.session.add(update)
109 self.db.session.commit() 109​ self.db.session.commit()
110 110​
111 def search_updates(self, bugids, release_num): 111​ def search_updates(self, bugids, release_num):
112 req_params = { 112​ queries_data = dict(
113 'bugs': ','.join(str(bug_id) for bug_id in bugids), 113​ bugs=[str(bug_id) for bug_id in bugids],
114 'release': 'f%d' % release_num, 114​ release='f%d' % release_num,
115 'limit': -1, 115​ limit=100,
116 } 116​ )
117 queries_data = self.bodhi_interface.send_request( 117​ result = self.bodhi_interface.query(**queries_data)
118 'list', req_params=req_params) 118​ if u'status' in result.keys():
119 if 'error' in queries_data: 119​ raise ServerError('', 200, result['errors'][0].description)
120 raise ServerError('', 200, queries_data['error']) 120​
121 updates = {} 121​ updates = {}
122 for update in queries_data['updates']: 122​ for update in result.updates:
123 if update.title not in updates: 123​ updates[update.title] = update
124​
125​ while result.page < result.pages:
126​ result = self.bodhi_interface.query(page=result.page + 1,
127​ **queries_data)
128​ for update in result.updates:
124 updates[update.title] = update 129​ updates[update.title] = update
130​
125 updates = updates.values() # updates without duplicates 131​ updates = updates.values() # updates without duplicates
126 self.log.info('found %d updates from bodhi for %d bugs in f%d' % 132​ self.log.info('found %d updates from bodhi for %d bugs in f%d' %
127 (len(updates), len(bugids), release_num)) 133​ (len(updates), len(bugids), release_num))
128 return [self.extract_information(update) for update in updates] 134​ return [self.extract_information(update) for update in updates]
129 135​
130 def get_release_bugs(self, release): 136​ def get_release_bugs(self, release):
131 buglist = [] 137​ buglist = []
132 for milestone in release.milestones: 138​ for milestone in release.milestones:
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines
View Options

init_db.sh

1#!/usr/bin/bash 1​#!/usr/bin/bash
2# this is a simple script to aid in the setup of a new db for F18 2​# this is a simple script to aid in the setup of a new db for F18
3 3​
4# generate config 4​# generate config
5#python blockerbugs/cli.py generate_config -d 'sqlite:////var/tmp/blockerbugs_db.sqlite' 5​#python blockerbugs/cli.py generate_config -d 'sqlite:////var/tmp/blockerbugs_db.sqlite'
6 6​
7# init db 7​# init db
8python run_cli.py init_db 8​python run_cli.py init_db
9 9​
10# add releases 10​# add releases
11python run_cli.py add_release -r 22 11​python run_cli.py add_release -r 23
12 12​
13# add milestones 13​# add milestones
14python run_cli.py add_milestone -r 22 -m alpha -b 1043121 -a 1043123 14​python run_cli.py add_milestone -r 23 -m alpha -b 1170817 -a 1170818
15python run_cli.py add_milestone -r 22 -m beta -b 1043125 -a 1043128 15​python run_cli.py add_milestone -r 23 -m beta -b 1170819 -a 1178020
16python run_cli.py add_milestone -r 22 -m final -b 1043130 -a 1043132 16​python run_cli.py add_milestone -r 23 -m final -b 1170821 -a 1170822
17 17​
View Options

testing/testfunc_update_sync.py

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Line(s)53class FakeBodhiInterface(object):
59 } 59​ }
60 60​
61 updates_time = { 61​ updates_time = {
62 update_for_bugs_2000_2001.title: datetime(2001, 1, 1), 62​ update_for_bugs_2000_2001.title: datetime(2001, 1, 1),
63 update1_for_bug_3000.title: datetime(2002, 1, 1), 63​ update1_for_bug_3000.title: datetime(2002, 1, 1),
64 update2_for_bug_3000.title: datetime(2003, 1, 1), 64​ update2_for_bug_3000.title: datetime(2003, 1, 1),
65 } 65​ }
66 66​
67 @classmethod 67​ def query(self, release=None, bugs=None, **kwargs):
68 def send_request(cls, method, req_params, *args, **kwargs): 68​ updates = list(chain(*(self.updates[(release, bug)] for bug in bugs)))
69 assert method == 'list' 69​ return Bunch(updates=updates,
70 bugs = req_params['bugs'] 70​ page=1,
71 release = req_params['release'] 71​ pages=1,
72 bugs = (bug.strip() for bug in bugs.split(',')) 72​ rows_per_page=20,
73 updates = list(chain(*(cls.updates[(release, bug)] for bug in bugs))) 73​ total=len(updates))
74 return Bunch(num_items=len(updates), ​
75 tg_flash=None, ​
76 title=u'%d update found' % (len(updates)), ​
77 updates=updates) ​
78 ​
79 74​
80class FakeErrorBodhiInterface(object): 75​class FakeErrorBodhiInterface(object):
81 @classmethod 76​ def query(self, **kwargs):
82 def send_request(cls, method, *args, **kwargs): 77​ return Bunch(errors=[Bunch(location=u"querystring",
83 assert method == 'list' 78​ name=u"release",
84 return Bunch(error=u"error message", num_items=0, 79​ description=u"Unknown release u'f99'")],
85 tg_flash=None, title=u"Unknown release u'f99'", 80​ status=u"error")
86 updates=[]) ​
87 81​
88 82​
89class FakeRaisesBodhiInterface(object): 83​class FakeRaisesBodhiInterface(object):
90 @classmethod 84​ def query(self, **kwargs):
91 def send_request(cls, method, *args, **kwargs): ​
92 assert method == 'list' ​
93 raise ServerError('https://admin.fedoraproject.org/updates/list', 85​ raise ServerError('https://admin.fedoraproject.org/updates/list',
94 500, 86​ 500,
95 'Internal Server Error') 87​ 'Internal Server Error')
96 88​
97 89​
98class TestfuncUpdateSync(object): 90​class TestfuncUpdateSync(object):
99 def setup_method(self, method): 91​ def setup_method(self, method):
100 db.session.flush() 92​ db.session.flush()
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s)
186 178​
187 def test_release_not_found_error(self): 179​ def test_release_not_found_error(self):
188 add_bug(4000, 'testbug1', self.test_milestone99alpha) 180​ add_bug(4000, 'testbug1', self.test_milestone99alpha)
189 update_sync = UpdateSync(db, FakeErrorBodhiInterface) 181​ update_sync = UpdateSync(db, FakeErrorBodhiInterface)
190 log_error = Mock(wraps=update_sync.log.error) 182​ log_error = Mock(wraps=update_sync.log.error)
191 update_sync.log.error = log_error 183​ update_sync.log.error = log_error
192 update_sync.sync_updates(self.test_release99) 184​ update_sync.sync_updates(self.test_release99)
193 assert log_error.call_count == 1 185​ assert log_error.call_count == 1
194 assert 'error message' in log_error.call_args[0][0] 186​ assert 'Unknown release' in log_error.call_args[0][0]
195 187​
196 def test_release_server_error(self): 188​ def test_release_server_error(self):
197 add_bug(4000, 'testbug1', self.test_milestone99alpha) 189​ add_bug(4000, 'testbug1', self.test_milestone99alpha)
198 update_sync = UpdateSync(db, FakeRaisesBodhiInterface) 190​ update_sync = UpdateSync(db, FakeRaisesBodhiInterface)
199 log_error = Mock(wraps=update_sync.log.error) 191​ log_error = Mock(wraps=update_sync.log.error)
200 update_sync.log.error = log_error 192​ update_sync.log.error = log_error
201 update_sync.sync_updates(self.test_release99) 193​ update_sync.sync_updates(self.test_release99)
202 assert log_error.call_count == 1 194​ assert log_error.call_count == 1
Show All 16 Lines