Differential D689

handle 0-day and stable blockers
ClosedPublic
Actions

Authored by adamwill on Dec 15 2015, 12:01 AM.

Details

Reviewers
tflink
mkrizek
Commits
rBLKRcc7ccb95640a: handle 0-day and stable blockers
Summary

As per discussion on test@, we'll be using a couple of new magic
whiteboard strings to identify two sets of 'special' blockers:
Accepted0Day and AcceptedPreviousRelease. The first are bugs that
must be fixed in the 0-day update set for the new release. The
second are bugs that must be fixed in updates for the previous
stable release(s) before the new release goes out. This commit
allows blockerbugs to handle them, displaying them as two new
groups on the Bug List and IRC Format pages.

Test Plan

Check that the new blocker types are correctly detected
and listed and the app works as before in all other respects.

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 handle 0-day and stable blockers.Dec 15 2015, 12:01 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: tflink, mkrizek.
adamwill updated this revision to Diff 1786.Dec 15 2015, 12:21 AM

add tests for new blocker types, add data to basicbuginfo

mkrizek requested changes to this revision.EditedDec 15 2015, 1:35 PM

Overall it looks good to me but since the patch changes database schema we need alembic migration script. It should be pretty straight-forward, see alembic/versions/ for inspiration.

This revision now requires changes to proceed.Dec 15 2015, 1:35 PM
adamwill updated this revision to Diff 1791.Dec 15 2015, 7:58 PM

add a database revision for the new bug columns

adamwill updated this revision to Diff 1792.Dec 15 2015, 8:09 PM

set False as the default for new blocker types on db upgrade

tflink added a comment.Dec 16 2015, 12:01 AM

The code is fine for the most part but I'm not thrilled about how cluttered the pages look after adding two more lists to them which are probably going to be empty 90% of the time.

I'm trying to think of a way to improve this without adding an unreasonable amount of work, any thoughts?

adamwill added a comment.Dec 16 2015, 12:16 AM

How about this?

--- a/blockerbugs/templates/blocker_list.html
+++ b/blockerbugs/templates/blocker_list.html
@@ -56,7 +56,7 @@ text: '<a href="' + $(this).contents().filter('a').attr('href') + '" title="More
 <div class="row">
     <div class="twelve columns" id="blockertables">
         {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %}
-        <h2>{% if buglists[buglist] %}{{ buglists[buglist] | length }}{% else %}No{% endif %} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2>
+        {% if buglists[buglist] %}<h2>{{ buglists[buglist] | length }} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2>
         <table id="{{ buglist | tagify }}" cellspacing="1" class="tablesorter">
             <thead>
                 <tr>
@@ -94,7 +94,10 @@ text: '<a href="' + $(this).contents().filter('a').attr('href') + '" title="More
                     </tr>
                     {% endfor %}
             </tbody>
-        </table>
+        </table>{% endif %}
+        {% endfor %}
+        {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %}
+            {% if not buglists[buglist] %}<h4>No {{ buglist }}</h4>{% endif %}
         {% endfor %}
     </div> <!-- end of 12 columns -->
 </div> <!-- end of row -->
adamwill updated this revision to Diff 1899.Feb 8 2016, 10:55 AM

make the blocker list HTML a bit more efficient

tflink accepted this revision.Feb 22 2016, 5:20 PM
mkrizek accepted this revision.Feb 22 2016, 7:18 PM
This revision is now accepted and ready to land.Feb 22 2016, 7:18 PM
Closed by commit rBLKRcc7ccb95640a: handle 0-day and stable blockers (authored by adamwill). · Explain WhyFeb 29 2016, 4:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1943

View Options

alembic/versions/5235a2628e22_add_new_blocker_types.py

  • This file was added.
1​"""add new blocker types
2​
3​Revision ID: 5235a2628e22
4​Revises: 4df932caa9a9
5​Create Date: 2015-12-15 11:47:55.476138
6​
7​"""
8​
9​# revision identifiers, used by Alembic.
10​revision = '5235a2628e22'
11​down_revision = '4df932caa9a9'
12​
13​from alembic import op
14​import sqlalchemy as sa
15​
16​
17​def upgrade():
18​ op.add_column('bug', sa.Column('accepted_0day', sa.Boolean, server_default=op.inline_literal(False)))
19​ op.add_column('bug', sa.Column('accepted_prevrel', sa.Boolean, server_default=op.inline_literal(False)))
20​
21​
22​def downgrade():
23​ op.drop_column('bug', 'accepted_0day')
24​ op.drop_column('bug', 'accepted_prevrel')
View Options

blockerbugs/controllers/api/api.py

Show All 37 Lines
38from utils import get_or_404, json_loads, JsonResponse, check_api_rights 38​from utils import get_or_404, json_loads, JsonResponse, check_api_rights
39 39​
40api_v0 = Blueprint('api', __name__, url_prefix='/api/v0') 40​api_v0 = Blueprint('api', __name__, url_prefix='/api/v0')
41 41​
42ACCEPTED_BUGTYPES = [ 42​ACCEPTED_BUGTYPES = [
43 'proposed_blocker', 'proposed_fe', 43​ 'proposed_blocker', 'proposed_fe',
44 'rejected_blocker', 'rejected_fe', 44​ 'rejected_blocker', 'rejected_fe',
45 'accepted_blocker', 'accepted_fe', 45​ 'accepted_blocker', 'accepted_fe',
46​ 'accepted_0day', 'accepted_prevrel'
46] 47​]
47 48​
48 49​
49@api_v0.errorhandler(errors.RestApiError) 50​@api_v0.errorhandler(errors.RestApiError)
50def api_error_handler(e): 51​def api_error_handler(e):
51 return JsonResponse(e.to_dict(), e.http_status_code) 52​ return JsonResponse(e.to_dict(), e.http_status_code)
52 53​
53 54​
▲ Show 20 Lines • Show All 186 Lines • Show Last 20 Lines
View Options

blockerbugs/controllers/main.py

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)47def get_recent_modifications(milestoneid):
48 now = datetime.datetime.utcnow() 48​ now = datetime.datetime.utcnow()
49 modcutoff = now - datetime.timedelta(1) 49​ modcutoff = now - datetime.timedelta(1)
50 recentmods = Bug.query.filter_by(milestone_id=milestoneid).filter( 50​ recentmods = Bug.query.filter_by(milestone_id=milestoneid).filter(
51 Bug.last_bug_sync > modcutoff).all() 51​ Bug.last_bug_sync > modcutoff).all()
52 return [bug.bugid for bug in recentmods] 52​ return [bug.bugid for bug in recentmods]
53 53​
54 54​
55def get_milestone_bugs(milestone): 55​def get_milestone_bugs(milestone):
56 bugz = {'Accepted Blockers':[], 'Proposed Blockers':[], 'Accepted Freeze Exceptions':[], 'Proposed Freeze Exceptions':[]} 56​ bugz = {'Accepted Blockers':[], 'Accepted 0-day Blockers':[], 'Accepted Previous Release Blockers':[], 'Proposed Blockers':[], 'Accepted Freeze Exceptions':[], 'Proposed Freeze Exceptions':[]}
57 57​
58 bugz['Accepted Blockers'] = Bug.query.filter_by(milestone=milestone, 58​ bugz['Accepted Blockers'] = Bug.query.filter_by(milestone=milestone,
59 accepted_blocker=True, 59​ accepted_blocker=True,
60 active=True).order_by(Bug.component, Bug.bugid).all() 60​ active=True).order_by(Bug.component, Bug.bugid).all()
61​ bugz['Accepted 0-day Blockers'] = Bug.query.filter_by(milestone=milestone,
62​ accepted_0day=True,
63​ active=True).order_by(Bug.component, Bug.bugid).all()
64​ bugz['Accepted Previous Release Blockers'] = Bug.query.filter_by(milestone=milestone,
65​ accepted_prevrel=True,
66​ active=True).order_by(Bug.component, Bug.bugid).all()
61 bugz['Proposed Blockers'] = Bug.query.filter_by(milestone=milestone, 67​ bugz['Proposed Blockers'] = Bug.query.filter_by(milestone=milestone,
62 proposed_blocker=True, 68​ proposed_blocker=True,
63 active=True).order_by(Bug.component, Bug.bugid).all() 69​ active=True).order_by(Bug.component, Bug.bugid).all()
64 bugz['Accepted Freeze Exceptions'] = Bug.query.filter_by(milestone=milestone, 70​ bugz['Accepted Freeze Exceptions'] = Bug.query.filter_by(milestone=milestone,
65 accepted_fe=True, 71​ accepted_fe=True,
66 active=True).order_by(Bug.component, Bug.bugid).all() 72​ active=True).order_by(Bug.component, Bug.bugid).all()
67 bugz['Proposed Freeze Exceptions'] = Bug.query.filter_by(milestone=milestone, 73​ bugz['Proposed Freeze Exceptions'] = Bug.query.filter_by(milestone=milestone,
68 proposed_fe=True, 74​ proposed_fe=True,
69 active=True).order_by(Bug.component, Bug.bugid).all() 75​ active=True).order_by(Bug.component, Bug.bugid).all()
70 return bugz 76​ return bugz
71 77​
72 78​
73def get_milestone_pending_stable_updates(milestone): 79​def get_milestone_pending_stable_updates(milestone):
74 """ 80​ """
75 return list of updates associated with milestone, 81​ return list of updates associated with milestone,
76 which are 'pending stable' in bodhi 82​ which are 'pending stable' in bodhi
77 and are marked as fixing any non-rejected blocker/fe bug 83​ and are marked as fixing any non-rejected blocker/fe bug
78 """ 84​ """
79 m_alias = db.aliased(Milestone) 85​ m_alias = db.aliased(Milestone)
80 updates = Update.query.join(m_alias, Update.milestones).filter( 86​ updates = Update.query.join(m_alias, Update.milestones).filter(
81 m_alias.id == milestone.id, 87​ m_alias.id == milestone.id,
82 Update.status == u'stable', Update.pending == True, 88​ Update.status == u'stable', Update.pending == True,
83 Update.bugs.any( 89​ Update.bugs.any(
84 or_(Bug.accepted_fe == True, Bug.accepted_blocker == True, 90​ or_(Bug.accepted_fe == True, Bug.accepted_blocker == True,
91​ Bug.accepted_0day == True, Bug.accepted_prevrel == True,
85 Bug.proposed_fe == True, Bug.proposed_blocker == True))).all() 92​ Bug.proposed_fe == True, Bug.proposed_blocker == True))).all()
86 return updates 93​ return updates
87 94​
88 95​
89def get_milestone_updates_testing(milestone): 96​def get_milestone_updates_testing(milestone):
90 """ 97​ """
91 return list of updates associated with milestone, 98​ return list of updates associated with milestone,
92 which are 'updates testing' in bodhi (not updates testing pending) 99​ which are 'updates testing' in bodhi (not updates testing pending)
93 and are marked as fixing any non-rejected blocker/fe bug 100​ and are marked as fixing any non-rejected blocker/fe bug
94 """ 101​ """
95 m_alias = db.aliased(Milestone) 102​ m_alias = db.aliased(Milestone)
96 updates = Update.query.join(m_alias, Update.milestones).filter( 103​ updates = Update.query.join(m_alias, Update.milestones).filter(
97 m_alias.id == milestone.id, Update.status == 'testing', 104​ m_alias.id == milestone.id, Update.status == 'testing',
98 Update.karma < Update.stable_karma, 105​ Update.karma < Update.stable_karma,
99 or_(Update.pending != True, Update.pending == None), 106​ or_(Update.pending != True, Update.pending == None),
100 Update.bugs.any( 107​ Update.bugs.any(
101 or_(Bug.accepted_fe == True, Bug.accepted_blocker == True, 108​ or_(Bug.accepted_fe == True, Bug.accepted_blocker == True,
109​ Bug.accepted_0day == True, Bug.accepted_prevrel == True,
102 Bug.proposed_fe == True, Bug.proposed_blocker == True))).all() 110​ Bug.proposed_fe == True, Bug.proposed_blocker == True))).all()
103 return updates 111​ return updates
104 112​
105 113​
106def get_current_milestone(): 114​def get_current_milestone():
107 current_milestone = Milestone.query.filter_by(current=True).first() 115​ current_milestone = Milestone.query.filter_by(current=True).first()
108 # if no current release is set, just grab one 116​ # if no current release is set, just grab one
109 if not current_milestone: 117​ if not current_milestone:
▲ Show 20 Lines • Show All 130 Lines • ▼ Show 20 Line(s)
240def display_stats(num, milestone_name): 248​def display_stats(num, milestone_name):
241 release = Release.query.filter_by(number=num).first() 249​ release = Release.query.filter_by(number=num).first()
242 milestone = Milestone.query.filter_by(release=release, version=milestone_name).first() 250​ milestone = Milestone.query.filter_by(release=release, version=milestone_name).first()
243 if not milestone: 251​ if not milestone:
244 abort(404) 252​ abort(404)
245 milestone_info = get_milestone_info(milestone) 253​ milestone_info = get_milestone_info(milestone)
246 254​
247 blockercount = {} 255​ blockercount = {}
248 blockercount['accepted'] = Bug.query.filter_by(milestone=milestone, 256​ blockercount['accepted'] = Bug.query.filter(Bug.milestone == milestone,
249 accepted_blocker=True, 257​ or_(Bug.accepted_blocker == True,
250 active=True).count() 258​ Bug.accepted_0day == True,
259​ Bug.accepted_prevrel == True),
260​ Bug.active == True).count()
251 261​
252 blockercount['proposed'] = Bug.query.filter_by(milestone=milestone, 262​ blockercount['proposed'] = Bug.query.filter_by(milestone=milestone,
253 proposed_blocker=True, 263​ proposed_blocker=True,
254 active=True).count() 264​ active=True).count()
255 265​
256 fecount = {} 266​ fecount = {}
257 fecount['accepted'] = Bug.query.filter_by(milestone=milestone, 267​ fecount['accepted'] = Bug.query.filter_by(milestone=milestone,
258 accepted_fe=True, 268​ accepted_fe=True,
259 active=True).count() 269​ active=True).count()
260 fecount['proposed'] = Bug.query.filter_by(milestone=milestone, 270​ fecount['proposed'] = Bug.query.filter_by(milestone=milestone,
261 proposed_fe=True, 271​ proposed_fe=True,
262 active=True).count() 272​ active=True).count()
263 273​
264 bugcount = {} 274​ bugcount = {}
265 bugcount['fe'] = Bug.query.filter(Bug.milestone == milestone, 275​ bugcount['fe'] = Bug.query.filter(Bug.milestone == milestone,
266 or_(Bug.accepted_fe == True, Bug.proposed_fe == True), 276​ or_(Bug.accepted_fe == True, Bug.proposed_fe == True),
267 Bug.active == True).count() 277​ Bug.active == True).count()
268 bugcount['blocker'] = Bug.query.filter(Bug.milestone == milestone, 278​ bugcount['blocker'] = Bug.query.filter(Bug.milestone == milestone,
269 or_(Bug.accepted_blocker == True, Bug.proposed_blocker == True), 279​ or_(Bug.accepted_blocker == True, Bug.accepted_0day == True,
280​ Bug.accepted_prevrel == True, Bug.proposed_blocker == True),
270 Bug.active == True).count() 281​ Bug.active == True).count()
271 282​
272 blocker_components = db.session.query(func.count(Bug.component), 283​ blocker_components = db.session.query(func.count(Bug.component),
273 Bug.component).filter(Bug.milestone==milestone, 284​ Bug.component).filter(Bug.milestone==milestone,
274 or_(Bug.accepted_blocker == True, Bug.proposed_blocker == True), 285​ or_(Bug.accepted_blocker == True, Bug.accepted_0day == True,
286​ Bug.accepted_prevrel == True, Bug.proposed_blocker == True),
275 Bug.active==True).group_by(Bug.component).order_by(desc(func.count(Bug.component))).all() 287​ Bug.active==True).group_by(Bug.component).order_by(desc(func.count(Bug.component))).all()
276 288​
277 fe_components = db.session.query(func.count(Bug.component), 289​ fe_components = db.session.query(func.count(Bug.component),
278 Bug.component).filter(Bug.milestone==milestone, 290​ Bug.component).filter(Bug.milestone==milestone,
279 or_(Bug.accepted_fe == True, Bug.proposed_fe == True), 291​ or_(Bug.accepted_fe == True, Bug.proposed_fe == True),
280 Bug.active==True).group_by(Bug.component).order_by(desc(func.count(Bug.component))).all() 292​ Bug.active==True).group_by(Bug.component).order_by(desc(func.count(Bug.component))).all()
281 293​
282 return render_template('milestone_stats.html', info=milestone_info, 294​ return render_template('milestone_stats.html', info=milestone_info,
▲ Show 20 Lines • Show All 143 Lines • Show Last 20 Lines
View Options

blockerbugs/models/bug.py

Show All 35 Lines28class Bug(db.Model):
36 last_bug_sync = db.Column(db.DateTime) 36​ last_bug_sync = db.Column(db.DateTime)
37 needinfo = db.Column(db.Boolean) 37​ needinfo = db.Column(db.Boolean)
38 needinfo_requestee = db.Column(db.String(1024), unique=False) 38​ needinfo_requestee = db.Column(db.String(1024), unique=False)
39 proposed_blocker = db.Column(db.Boolean) 39​ proposed_blocker = db.Column(db.Boolean)
40 proposed_fe = db.Column(db.Boolean) 40​ proposed_fe = db.Column(db.Boolean)
41 rejected_blocker = db.Column(db.Boolean) 41​ rejected_blocker = db.Column(db.Boolean)
42 rejected_fe = db.Column(db.Boolean) 42​ rejected_fe = db.Column(db.Boolean)
43 accepted_blocker = db.Column(db.Boolean) 43​ accepted_blocker = db.Column(db.Boolean)
44​ accepted_0day = db.Column(db.Boolean)
45​ accepted_prevrel = db.Column(db.Boolean)
44 accepted_fe = db.Column(db.Boolean) 46​ accepted_fe = db.Column(db.Boolean)
45 milestone_id = db.Column(db.Integer, db.ForeignKey('milestone.id')) 47​ milestone_id = db.Column(db.Integer, db.ForeignKey('milestone.id'))
46 milestone = db.relationship('Milestone', 48​ milestone = db.relationship('Milestone',
47 backref=db.backref('bugs', lazy='dynamic')) 49​ backref=db.backref('bugs', lazy='dynamic'))
48 #backref='bugs') 50​ #backref='bugs')
49 51​
50 def __init__(self, bugid, url, summary, status, component, milestone, 52​ def __init__(self, bugid, url, summary, status, component, milestone,
51 active, needinfo, needinfo_requestee, 53​ active, needinfo, needinfo_requestee,
52 last_bug_sync=datetime.datetime.now()): 54​ last_bug_sync=datetime.datetime.now()):
53 self.bugid = bugid 55​ self.bugid = bugid
54 self.url = url 56​ self.url = url
55 self.summary = summary 57​ self.summary = summary
56 self.status = status 58​ self.status = status
57 self.component = component 59​ self.component = component
58 self.active = active 60​ self.active = active
59 self.needinfo = needinfo 61​ self.needinfo = needinfo
60 self.needinfo_requestee = needinfo_requestee 62​ self.needinfo_requestee = needinfo_requestee
61 self.milestone = milestone 63​ self.milestone = milestone
62 self.proposed_blocker = False 64​ self.proposed_blocker = False
63 self.accepted_blocker = False 65​ self.accepted_blocker = False
66​ self.accepted_0day = False
67​ self.accepted_prevrel = False
64 self.rejected_blocker = False 68​ self.rejected_blocker = False
65 self.proposed_fe = False 69​ self.proposed_fe = False
66 self.accepted_fe = False 70​ self.accepted_fe = False
67 self.rejected_fe = False 71​ self.rejected_fe = False
68 self.last_bug_sync = last_bug_sync 72​ self.last_bug_sync = last_bug_sync
69 73​
70 def __repr__(self): 74​ def __repr__(self):
71 return '<bug %d: %s>' % (self.bugid, self.summary) 75​ return '<bug %d: %s>' % (self.bugid, self.summary)
72 76​
73 def update(self, buginfo, tracker_type, release): 77​ def update(self, buginfo, tracker_type, release):
74 self.url = buginfo['url'] 78​ self.url = buginfo['url']
75 self.summary = buginfo['summary'] 79​ self.summary = buginfo['summary']
76 self.status = buginfo['status'] 80​ self.status = buginfo['status']
77 self.component = buginfo['component'] 81​ self.component = buginfo['component']
78 self.last_bug_sync = buginfo['last_change_time'] 82​ self.last_bug_sync = buginfo['last_change_time']
79 self.active = buginfo['active'] 83​ self.active = buginfo['active']
80 self.needinfo = buginfo['needinfo'] 84​ self.needinfo = buginfo['needinfo']
81 self.needinfo_requestee = buginfo['needinfo_requestee'] 85​ self.needinfo_requestee = buginfo['needinfo_requestee']
82 if tracker_type == 'Blocker': 86​ if tracker_type == 'Blocker':
83 self.proposed_blocker = buginfo['proposed'] 87​ self.proposed_blocker = buginfo['proposed']
88​ self.accepted_0day = buginfo['0day']
89​ self.accepted_prevrel = buginfo['prevrel']
84 self.accepted_blocker = buginfo['accepted'] 90​ self.accepted_blocker = buginfo['accepted']
85 self.rejected_blocker = buginfo['rejected'] 91​ self.rejected_blocker = buginfo['rejected']
86 elif tracker_type == 'FreezeException': 92​ elif tracker_type == 'FreezeException':
87 self.proposed_fe = buginfo['proposed'] 93​ self.proposed_fe = buginfo['proposed']
88 self.accepted_fe = buginfo['accepted'] 94​ self.accepted_fe = buginfo['accepted']
89 self.rejected_fe = buginfo['rejected'] 95​ self.rejected_fe = buginfo['rejected']
90 if release.id != self.milestone.id: 96​ if release.id != self.milestone.id:
91 raise ValueError('Bugs with the same id and different releases should be different rows!') 97​ raise ValueError('Bugs with the same id and different releases should be different rows!')
92 98​
93 @classmethod 99​ @classmethod
94 def from_data(cls, buginfo, release, tracker_type): 100​ def from_data(cls, buginfo, release, tracker_type):
95 newbug = Bug(buginfo['bug_id'], '', '', '','', release, buginfo['active'], False, '') 101​ newbug = Bug(buginfo['bug_id'], '', '', '','', release, buginfo['active'], False, '')
96 newbug.update(buginfo, tracker_type, release) 102​ newbug.update(buginfo, tracker_type, release)
97 return newbug 103​ return newbug
98 104​
View Options

blockerbugs/templates/blocker_list.html

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Line(s)
50{% endblock %} 50​{% endblock %}
51 51​
52 52​
53{% block body %} 53​{% block body %}
54 54​
55 55​
56<div class="row"> 56​<div class="row">
57 <div class="twelve columns" id="blockertables"> 57​ <div class="twelve columns" id="blockertables">
58 {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %} 58​ {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %}
59 <h2>{% if buglists[buglist] %}{{ buglists[buglist] | length }}{% else %}No{% endif %} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2> 59​ {% if buglists[buglist] %}<h2>{{ buglists[buglist] | length }} {% if (buglists[buglist] | length) == 1 %}{{ buglist[:-1]}}{% else %}{{ buglist }}{% endif %}</h2>
60 <table id="{{ buglist | tagify }}" cellspacing="1" class="tablesorter"> 60​ <table id="{{ buglist | tagify }}" cellspacing="1" class="tablesorter">
61 <thead> 61​ <thead>
62 <tr> 62​ <tr>
63 <th></th> 63​ <th></th>
64 <th>Bug ID</th> 64​ <th>Bug ID</th>
65 <th>Component</th> 65​ <th>Component</th>
66 <th>Status</th> 66​ <th>Status</th>
67 <th>Title</th> 67​ <th>Title</th>
Show All 21 Lines87 <tr>
89 <td></td> 89​ <td></td>
90 <td></td> 90​ <td></td>
91 <td></td> 91​ <td></td>
92 <td></td> 92​ <td></td>
93 <td></td> 93​ <td></td>
94 </tr> 94​ </tr>
95 {% endfor %} 95​ {% endfor %}
96 </tbody> 96​ </tbody>
97 </table> 97​ </table>{% endif %}
98​ {% endfor %}
99​ {% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %}
100​ {% if not buglists[buglist] %}<h4>No {{ buglist }}</h4>{% endif %}
98 {% endfor %} 101​ {% endfor %}
99 </div> <!-- end of 12 columns --> 102​ </div> <!-- end of 12 columns -->
100</div> <!-- end of row --> 103​</div> <!-- end of row -->
101{% endblock %} 104​{% endblock %}
View Options

blockerbugs/templates/irc_format.txt

1{% autoescape false %} 1​{% autoescape false %}
2============================================================ 2​============================================================
3Blocker Bugs List - Review Meeting IRC Format 3​Blocker Bugs List - Review Meeting IRC Format
4Milestone: Fedora {{ info['number'] }} {{ info['phase'] }} 4​Milestone: Fedora {{ info['number'] }} {{ info['phase'] }}
5Last Update: {{ info['last_updated'] }} 5​Last Update: {{ info['last_updated'] }}
6============================================================ 6​============================================================
7 7​
8{% for buglist in ['Proposed Blockers','Accepted Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] -%} 8​{% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] -%}
9#info {{ buglists[buglist]|length }} {{ buglist }} 9​#info {{ buglists[buglist]|length }} {{ buglist }}
10{% endfor %} 10​{% endfor %}
11 11​
12{% for buglist in ['Proposed Blockers','Accepted Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %} 12​{% for buglist in ['Proposed Blockers','Accepted Blockers', 'Accepted 0-day Blockers', 'Accepted Previous Release Blockers', 'Proposed Freeze Exceptions', 'Accepted Freeze Exceptions'] %}
13============================================================ 13​============================================================
14{{ buglist }} 14​{{ buglist }}
15============================================================ 15​============================================================
16 16​
17{% for bug in buglists[buglist] -%} 17​{% for bug in buglists[buglist] -%}
18#topic ({{ bug.bugid }}) {{ bug.summary }} 18​#topic ({{ bug.bugid }}) {{ bug.summary }}
19#link {{ bug.url }} 19​#link {{ bug.url }}
20#info {{ buglist | replace("Blockers", "Blocker") }}, {{ bug.component }}, {{ bug.status }} 20​#info {{ buglist | replace("Blockers", "Blocker") }}, {{ bug.component }}, {{ bug.status }}
21 21​
22{% endfor -%} {# end of bug iteration #} 22​{% endfor -%} {# end of bug iteration #}
23{% endfor %} {# end of buglist iteration #} 23​{% endfor %} {# end of buglist iteration #}
24{% endautoescape %} 24​{% endautoescape %}
View Options

blockerbugs/templates/update_list.html

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)41 <tbody>
42 {% for update in updates[update_list] %} 42​ {% for update in updates[update_list] %}
43 <tr> 43​ <tr>
44 <td>{{ update | updatetype }}</td> 44​ <td>{{ update | updatetype }}</td>
45 <td>{{ update.bugs[0].component }}</td> 45​ <td>{{ update.bugs[0].component }}</td>
46 <td><a href='{{ update.url }}'>'{{ update.title }}'</a></td> 46​ <td><a href='{{ update.url }}'>'{{ update.title }}'</a></td>
47 <td>{{ statustext(update) }}</td> 47​ <td>{{ statustext(update) }}</td>
48 <td> 48​ <td>
49 {% for bug in update.bugs %} 49​ {% for bug in update.bugs %}
50 {% if (bug.proposed_blocker or bug.proposed_fe or bug.accepted_blocker or bug.accepted_fe) %} 50​ {% if (bug.proposed_blocker or bug.proposed_fe or bug.accepted_blocker or bug.accepted_fe or bug.accepted_0day or bug.accepted_prevrel) %}
51 <a href={{ bug.url }} title={{ bug.summary }}> 51​ <a href={{ bug.url }} title={{ bug.summary }}>
52 {{ bug.bugid }} 52​ {{ bug.bugid }}
53 </a> 53​ </a>
54 {% endif %} 54​ {% endif %}
55 {% endfor %} 55​ {% endfor %}
56 </td> 56​ </td>
57 </tr> 57​ </tr>
58 {% else %} 58​ {% else %}
Show All 15 Lines
View Options

blockerbugs/util/bug_sync.py

Show All 38 Lines33 def __init__(self, db, bzinterface=None, url=None):
39 else: 39​ else:
40 self.bzinterface = bzinterface 40​ self.bzinterface = bzinterface
41 41​
42 def extract_information(self, bug, tracker_type): 42​ def extract_information(self, bug, tracker_type):
43 buginfo = {} 43​ buginfo = {}
44 bug_whiteboard = bug.whiteboard 44​ bug_whiteboard = bug.whiteboard
45 45​
46 # get information about accepted/rejected 46​ # get information about accepted/rejected
47​ buginfo['0day'] = 'Accepted0Day' in bug_whiteboard
48​ buginfo['prevrel'] = 'AcceptedPreviousRelease' in bug_whiteboard
47 buginfo['accepted'] = ('Accepted%s' % tracker_type) in bug_whiteboard 49​ buginfo['accepted'] = ('Accepted%s' % tracker_type) in bug_whiteboard
48 buginfo['rejected'] = ('Rejected%s' % tracker_type) in bug_whiteboard 50​ buginfo['rejected'] = ('Rejected%s' % tracker_type) in bug_whiteboard
49 buginfo['proposed'] = not (buginfo['rejected'] or buginfo['accepted']) 51​ buginfo['proposed'] = not (buginfo['rejected'] or buginfo['accepted'])
50 52​
51 # determine whether or not the bug is active (not CLOSED) 53​ # determine whether or not the bug is active (not CLOSED)
52 buginfo['active'] = not self.closedre.match(bug.status) 54​ buginfo['active'] = not self.closedre.match(bug.status)
53 55​
54 # basic info 56​ # basic info
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Line(s)121 def cleanup_milestone(self, milestone, tracker_type):
124 126​
125 tracker_depends = set(self.bzinterface.get_deps(trackerid)) 127​ tracker_depends = set(self.bzinterface.get_deps(trackerid))
126 self.log.debug("Current dependencies for %d: %s" % (trackerid, str(tracker_depends))) 128​ self.log.debug("Current dependencies for %d: %s" % (trackerid, str(tracker_depends)))
127 if tracker_type == 'FreezeException': 129​ if tracker_type == 'FreezeException':
128 blockers = Bug.query.filter_by(milestone=milestone).filter(or_(Bug.proposed_fe == True, 130​ blockers = Bug.query.filter_by(milestone=milestone).filter(or_(Bug.proposed_fe == True,
129 Bug.accepted_fe == True)).all() 131​ Bug.accepted_fe == True)).all()
130 elif tracker_type == 'Blocker': 132​ elif tracker_type == 'Blocker':
131 blockers = Bug.query.filter_by(milestone=milestone).filter(or_(Bug.proposed_blocker == True, 133​ blockers = Bug.query.filter_by(milestone=milestone).filter(or_(Bug.proposed_blocker == True,
132 Bug.accepted_blocker == True)).all() 134​ Bug.accepted_blocker == True,
135​ Bug.accepted_0day == True,
136​ Bug.accepted_prevrel == True)).all()
133 for blocker in blockers: 137​ for blocker in blockers:
134 if not blocker.bugid in tracker_depends: 138​ if not blocker.bugid in tracker_depends:
135 if tracker_type == 'FreezeException': 139​ if tracker_type == 'FreezeException':
136 blocker.proposed_fe = False 140​ blocker.proposed_fe = False
137 blocker.accepted_fe = False 141​ blocker.accepted_fe = False
138 blocker.rejected_fe = True 142​ blocker.rejected_fe = True
139 elif tracker_type == 'Blocker': 143​ elif tracker_type == 'Blocker':
140 blocker.proposed_blocker = False 144​ blocker.proposed_blocker = False
141 blocker.accepted_blocker = False 145​ blocker.accepted_blocker = False
146​ blocker.accepted_0day = False
147​ blocker.accepted_prevrel = False
142 blocker.rejected_blocker = True 148​ blocker.rejected_blocker = True
143 self.db.session.add(blocker) 149​ self.db.session.add(blocker)
144 self.db.session.commit() 150​ self.db.session.commit()
145 151​
146 152​
147 def update_active(self, full_sync=False): 153​ def update_active(self, full_sync=False):
148 starttime = datetime.utcnow() 154​ starttime = datetime.utcnow()
149 active_milestones = Milestone.query.filter_by(active=True).all() 155​ active_milestones = Milestone.query.filter_by(active=True).all()
Show All 23 Lines
View Options

testing/test_bugsync_extract_information.py

Show First 20 Lines • Show All 67 Lines • ▼ Show 20 Line(s)18class TestSyncExtractInformation(object):
68 def test_blocker_isaccepted(self): 68​ def test_blocker_isaccepted(self):
69 self.testbug.whiteboard = 'AcceptedBlocker' 69​ self.testbug.whiteboard = 'AcceptedBlocker'
70 ref_isaccepted = True 70​ ref_isaccepted = True
71 71​
72 buginfo = self.testsync.extract_information(self.testbug, 'Blocker') 72​ buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
73 73​
74 assert buginfo['accepted'] == ref_isaccepted 74​ assert buginfo['accepted'] == ref_isaccepted
75 75​
76​ def test_blocker_isaccepted_0day(self):
77​ self.testbug.whiteboard = 'Accepted0Day'
78​ ref_isaccepted = True
79​
80​ buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
81​
82​ assert buginfo['0day'] == ref_isaccepted
83​
84​ def test_blocker_isaccepted_prevrel(self):
85​ self.testbug.whiteboard = 'AcceptedPreviousRelease'
86​ ref_isaccepted = True
87​
88​ buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
89​
90​ assert buginfo['prevrel'] == ref_isaccepted
91​
76 def test_blocker_isaccepted_notproposed(self): 92​ def test_blocker_isaccepted_notproposed(self):
77 self.testbug.whiteboard = 'AcceptedBlocker' 93​ self.testbug.whiteboard = 'AcceptedBlocker'
78 94​
79 buginfo = self.testsync.extract_information(self.testbug, 'Blocker') 95​ buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
80 96​
81 assert buginfo['proposed'] == False 97​ assert buginfo['proposed'] == False
82 98​
83 def test_bugid(self): 99​ def test_bugid(self):
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines
View Options

testing/testfunc_bugsync.py

Show All 22 Lines
23templatebuginfo = { 23​templatebuginfo = {
24 'bug_id': 123456, 24​ 'bug_id': 123456,
25 'url': 'https://bugzilla.redhat.com/show_bug.cgi?id=123456', 25​ 'url': 'https://bugzilla.redhat.com/show_bug.cgi?id=123456',
26 'component': 'randomcomponent', 26​ 'component': 'randomcomponent',
27 'status': 'NEW', 27​ 'status': 'NEW',
28 'summary': 'this is a test bug', 28​ 'summary': 'this is a test bug',
29 'whiteboard': '', 29​ 'whiteboard': '',
30 'accepted': False, 30​ 'accepted': False,
31​ '0day': False,
32​ 'prevrel': False,
31 'rejected': False, 33​ 'rejected': False,
32 'proposed': False, 34​ 'proposed': False,
33 'last_change_time': datetime.datetime.utcnow(), 35​ 'last_change_time': datetime.datetime.utcnow(),
34 'active': True, 36​ 'active': True,
35 'needinfo': True, 37​ 'needinfo': True,
36 'needinfo_requestee': 'John Doe' 38​ 'needinfo_requestee': 'John Doe'
37} 39​}
38 40​
▲ Show 20 Lines • Show All 252 Lines • Show Last 20 Lines