Differential D1051

Remove `clean_updates` entirely, it's no longer needed
ClosedPublic
Actions

Authored by adamwill on Nov 9 2016, 12:53 AM.

Details

Reviewers
tflink
mkrizek
Commits
rBLKR2da425e35490: Remove `clean_updates` entirely, it's no longer needed
Summary

clean_updates was added to cope with updates being deleted
from Bodhi. With Bodhi 2, this is expressly disallowed, updates
cannot be deleted. So we really don't need clean_updates at
all any more.

Test Plan

I guess check everything still works, no reason why
it shouldn't. If you want to satisfy yourself that deleting
updates is no longer possible in Bodhi 2, see e.g.
https://github.com/fedora-infra/python-fedora/blob/develop/fedora/client/bodhi.py#L181-L186

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.
adamwill retitled this revision from to Remove `clean_updates` entirely, it's no longer needed.Nov 9 2016, 12:53 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: tflink, mkrizek.
mkrizek accepted this revision.Nov 11 2016, 8:55 AM

Just code deletions, my favorite kind of patches. :) LGTM

This revision is now accepted and ready to land.Nov 11 2016, 8:55 AM
Closed by commit rBLKR2da425e35490: Remove `clean_updates` entirely, it's no longer needed (authored by adamwill). · Explain WhyNov 17 2016, 12:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2688

View Options

blockerbugs/util/update_sync.py

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s)34class UpdateSync(object):
87 87​
88 def is_watched_bug(self, bugnum): 88​ def is_watched_bug(self, bugnum):
89 watched_bug = Bug.query.filter_by(bugid=bugnum).first() 89​ watched_bug = Bug.query.filter_by(bugid=bugnum).first()
90 if watched_bug: 90​ if watched_bug:
91 return True 91​ return True
92 else: 92​ else:
93 return False 93​ return False
94 94​
95 def clean_updates(self, updates, relid): ​
96 query_updates = Update.query.filter( ​
97 Update.status != 'obsolete', ​
98 Update.status != 'deleted', ​
99 Update.release_id == relid, ​
100 ).all() ​
101 db_updates = set(update.title for update in query_updates) ​
102 bodhi_updates = set(update['title'] for update in updates) ​
103 deleted_updates = db_updates.difference(bodhi_updates) ​
104 ​
105 for update in query_updates: ​
106 if update.title in deleted_updates: ​
107 update.status = 'deleted' ​
108 self.db.session.add(update) ​
109 self.db.session.commit() ​
110 ​
111 def search_updates(self, bugids, release_num): 95​ def search_updates(self, bugids, release_num):
112 queries_data = dict( 96​ queries_data = dict(
113 bugs=[str(bug_id) for bug_id in bugids], 97​ bugs=[str(bug_id) for bug_id in bugids],
114 release='f%d' % release_num, 98​ release='f%d' % release_num,
115 limit=100, 99​ limit=100,
116 ) 100​ )
117 try: 101​ try:
118 result = self.bodhi_interface.query(**queries_data) 102​ result = self.bodhi_interface.query(**queries_data)
Show All 37 Lines136 def sync_bug_updates(self, release, bugs, fullsync=False):
156 try: 140​ try:
157 updates = self.search_updates(bugs_ids, release.number) 141​ updates = self.search_updates(bugs_ids, release.number)
158 except ServerError, ex: 142​ except ServerError, ex:
159 self.log.error( 143​ self.log.error(
160 'f{r.number} sync updates failed: {e.code} {e.msg}'.format( 144​ 'f{r.number} sync updates failed: {e.code} {e.msg}'.format(
161 e=ex, r=release)) 145​ e=ex, r=release))
162 return 146​ return
163 147​
164 # mark deleted updates ​
165 self.clean_updates(updates, release.id) ​
166 ​
167 for update in updates: 148​ for update in updates:
168 self.log.debug('running sync for update %s' % update['title']) 149​ self.log.debug('running sync for update %s' % update['title'])
169 existing_update = Update.query.filter_by( 150​ existing_update = Update.query.filter_by(
170 title=update['title']).first() 151​ title=update['title']).first()
171 if existing_update: 152​ if existing_update:
172 self.log.debug( 153​ self.log.debug(
173 'syncing existing update %s' % existing_update.title) 154​ 'syncing existing update %s' % existing_update.title)
174 existing_update.sync(update, fullsync) 155​ existing_update.sync(update, fullsync)
Show All 20 Lines
View Options

testing/testfunc_update_sync.py

Show First 20 Lines • Show All 187 Lines • ▼ Show 20 Line(s)90class TestfuncUpdateSync(object):
188 def test_release_server_error(self): 188​ def test_release_server_error(self):
189 add_bug(4000, 'testbug1', self.test_milestone99alpha) 189​ add_bug(4000, 'testbug1', self.test_milestone99alpha)
190 update_sync = UpdateSync(db, FakeRaisesBodhiInterface) 190​ update_sync = UpdateSync(db, FakeRaisesBodhiInterface)
191 log_error = Mock(wraps=update_sync.log.error) 191​ log_error = Mock(wraps=update_sync.log.error)
192 update_sync.log.error = log_error 192​ update_sync.log.error = log_error
193 update_sync.sync_updates(self.test_release99) 193​ update_sync.sync_updates(self.test_release99)
194 assert log_error.call_count == 1 194​ assert log_error.call_count == 1
195 assert 'Internal Server Error' in log_error.call_args[0][0] 195​ assert 'Internal Server Error' in log_error.call_args[0][0]
196 ​
197 def test_sync_clean_updates(self): ​
198 add_bug(3000, 'testbug1', self.test_milestone99alpha) ​
199 ​
200 self.update_sync.sync_updates(self.test_release99) ​
201 updates = Update.query.filter(Update.status == 'deleted').all() ​
202 assert len(updates) == 0 ​
203 ​
204 b = FakeBodhiInterface ​
205 b.updates[('f99', '3000')] = [update1_for_bug_3000] ​
206 update_sync = UpdateSync(db, b) ​
207 ​
208 update_sync.sync_updates(self.test_release99) ​
209 updates = Update.query.filter(Update.status == 'deleted').all() ​
210 assert len(updates) == 1 ​