Differential D13

Don't pull deleted and obsolete updates for updates cleanup
ClosedPublic
Actions

Authored by mkrizek on Feb 21 2014, 12:04 PM.

Details

Reviewers
tflink
Maniphest Tasks
T21: Do not display obsolete and deleted updates
Commits
rBLKR60c902ad7d59: Merge branch 'feature/T21-deleted_updates' into develop
Summary

Fixes T21

Test Plan

Sync works fine for me

Diff Detail

Branch
feature/T21-deleted_updates
Lint
No Linters Available
Unit
No Unit Test Coverage
tflink accepted this revision.Feb 24 2014, 4:16 AM

LGTM, merge into develop

Revision Contents

Diff 28

View Options

blockerbugs/__init__.py

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s)137 for bug in update.bugs:
140 elif bug.proposed_fe or bug.accepted_fe: 140​ elif bug.proposed_fe or bug.accepted_fe:
141 is_fe = True 141​ is_fe = True
142 if is_fe: 142​ if is_fe:
143 return 'FE' 143​ return 'FE'
144 144​
145 145​
146@app.template_filter('updatelabel') 146​@app.template_filter('updatelabel')
147def updatelabel(bug): 147​def updatelabel(bug):
148​ from models.update import Update
148 label = [] 149​ label = []
149 lowest_status_update = bug.updates.first() 150​ lowest_status_update = bug.updates.filter(Update.status != 'obsolete', Update.status != 'deleted').first()
150 if lowest_status_update: 151​ if lowest_status_update:
151 if lowest_status_update.status == 'stable': 152​ if lowest_status_update.status == 'stable':
152 if bug.status in ['MODIFIED', 'ON_QA', 'VERIFIED', 'CLOSED']: 153​ if bug.status in ['MODIFIED', 'ON_QA', 'VERIFIED', 'CLOSED']:
153 label.append('<span class="radius success label">') 154​ label.append('<span class="radius success label">')
154 if lowest_status_update.pending: 155​ if lowest_status_update.pending:
155 label.append('pending ') 156​ label.append('pending ')
156 label.append('stable</span>') 157​ label.append('stable</span>')
157 158​
Show All 28 Lines
View Options

blockerbugs/controllers/main.py

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Line(s)
157 157​
158 158​
159@main.route('/bug/<int:bugid>/updates') 159​@main.route('/bug/<int:bugid>/updates')
160def display_bug_updates(bugid): 160​def display_bug_updates(bugid):
161 bug = Bug.query.filter_by(bugid=bugid).first() 161​ bug = Bug.query.filter_by(bugid=bugid).first()
162 if not bug: 162​ if not bug:
163 abort(404) 163​ abort(404)
164 packagename = bug.component 164​ packagename = bug.component
165 updates = bug.updates.all() 165​ updates = bug.updates.filter(Update.status != 'obsolete', Update.status != 'deleted').all()
166 return render_template('bug_tooltip.html', packagename=packagename, updates=updates) 166​ return render_template('bug_tooltip.html', packagename=packagename, updates=updates)
167 167​
168 168​
169@main.route('/milestone/<int:num>/<release_name>/irc') 169​@main.route('/milestone/<int:num>/<release_name>/irc')
170def display_irc_blockers(num, release_name): 170​def display_irc_blockers(num, release_name):
171 release = Release.query.filter_by(number=num).first() 171​ release = Release.query.filter_by(number=num).first()
172 milestone = Milestone.query.filter_by(release=release, version=release_name).first() 172​ milestone = Milestone.query.filter_by(release=release, version=release_name).first()
173 if not milestone: 173​ if not milestone:
▲ Show 20 Lines • Show All 253 Lines • Show Last 20 Lines
View Options

blockerbugs/util/update_sync.py

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s)33class UpdateSync(object):
90 90​
91 def is_watched_bug(self, bugnum): 91​ def is_watched_bug(self, bugnum):
92 watched_bug = Bug.query.filter_by(bugid=bugnum).first() 92​ watched_bug = Bug.query.filter_by(bugid=bugnum).first()
93 if watched_bug: 93​ if watched_bug:
94 return True 94​ return True
95 else: 95​ else:
96 return False 96​ return False
97 97​
98​ def clean_updates(self, updates):
99​ query_updates = Update.query.filter(Update.status != 'obsolete', Update.status != 'deleted').all()
100​ db_updates = set(update.title for update in query_updates)
101​ bodhi_updates = set(update['title'] for update in updates)
102​ deleted_updates = db_updates.difference(bodhi_updates)
103​
104​ for update in query_updates:
105​ if update.title in deleted_updates:
106​ update.status = 'deleted'
107​ self.db.session.add(update)
108​ self.db.session.commit()
109​
98 def search_updates(self, bugids, release_num): 110​ def search_updates(self, bugids, release_num):
99 req_params = { 111​ req_params = {
100 'bugs': ','.join(str(bug_id) for bug_id in bugids), 112​ 'bugs': ','.join(str(bug_id) for bug_id in bugids),
101 'release': 'f%d' % release_num, 113​ 'release': 'f%d' % release_num,
102 'limit': -1, 114​ 'limit': -1,
103 } 115​ }
104 queries_data = self.bodhi_interface.send_request( 116​ queries_data = self.bodhi_interface.send_request(
105 'list', req_params=req_params) 117​ 'list', req_params=req_params)
Show All 20 Lines135 def sync_bug_updates(self, release, bugs):
126 self.log.debug('searching for updates for bugs %s' % str(bugs_ids)) 138​ self.log.debug('searching for updates for bugs %s' % str(bugs_ids))
127 try: 139​ try:
128 updates = self.search_updates(bugs_ids, release.number) 140​ updates = self.search_updates(bugs_ids, release.number)
129 except ServerError, ex: 141​ except ServerError, ex:
130 self.log.error( 142​ self.log.error(
131 'f{r.number} sync updates failed: {e.code} {e.msg}'.format( 143​ 'f{r.number} sync updates failed: {e.code} {e.msg}'.format(
132 e=ex, r=release)) 144​ e=ex, r=release))
133 return 145​ return
146​
147​ # mark deleted updates
148​ self.clean_updates(updates)
149​
134 for update in updates: 150​ for update in updates:
135 self.log.debug('running sync for update %s' % update['title']) 151​ self.log.debug('running sync for update %s' % update['title'])
136 existing_update = Update.query.filter_by( 152​ existing_update = Update.query.filter_by(
137 title=update['title']).first() 153​ title=update['title']).first()
138 if existing_update: 154​ if existing_update:
139 self.log.debug( 155​ self.log.debug(
140 'syncing existing update %s' % existing_update.title) 156​ 'syncing existing update %s' % existing_update.title)
141 existing_update.sync(update, bug.milestone) 157​ existing_update.sync(update, bug.milestone)
Show All 21 Lines
View Options

testing/testfunc_update_sync.py

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