charmworld

Merge lp:~jcsackett/charmworld/rip-out-old-queues into lp:charmworld

  1. rip-out-old-queues
  2. Merge into trunk
Proposed by j.c.sackett
Status: Merged
Approved by: j.c.sackett
Approved revision: 455
Merged at revision: 457
Proposed branch: lp:~jcsackett/charmworld/rip-out-old-queues
Merge into: lp:charmworld
Diff against target: 164 lines (+0/-103)
6 files modified
charmworld/routes.py (+0/-2)
charmworld/templates/charm-proof-errors.pt (+0/-27)
charmworld/templates/store-missing.pt (+0/-27)
charmworld/templates/tools.pt (+0/-2)
charmworld/views/tests/test_tools.py (+0/-17)
charmworld/views/tools.py (+0/-28)
To merge this branch: bzr merge lp:~jcsackett/charmworld/rip-out-old-queues
Reviewer Review Type Date Requested Status
Juju Gui Bot continuous-integration Approve
Curtis Hovey (community) code Approve
Review via email: mp+194647@code.launchpad.net

Commit message

Remove the old proof etc queues.

Description of the change

This removes the old, non-review queues. Their functionality has been merged
into the review queue and it has been confirmed we don't need them.

Templates, views, and tests have been deleted.

Old queue routes have been removed; the tools and the tools-review routes are
not modified to avoid breaking bookmarks.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)
lp:~jcsackett/charmworld/rip-out-old-queues updated
455. By j.c.sackett

Merged trunk.

Revision history for this message
Juju Gui Bot (juju-gui-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmworld/routes.py'
2--- charmworld/routes.py 2013-11-04 20:52:52 +0000
3+++ charmworld/routes.py 2013-11-12 17:29:57 +0000
4@@ -71,8 +71,6 @@
5 # Tools
6 config.add_route("tools", "/tools")
7 config.add_route("tools-review", "/tools/review-queue")
8- config.add_route("tools-store-missing", "/tools/store-missing")
9- config.add_route("tools-proof-errors", "/tools/proof-errors")
10
11 # Experiment
12 config.add_route("charm-graph", "/charm-graph")
13
14=== removed file 'charmworld/templates/charm-proof-errors.pt'
15--- charmworld/templates/charm-proof-errors.pt 2013-09-03 14:15:49 +0000
16+++ charmworld/templates/charm-proof-errors.pt 1970-01-01 00:00:00 +0000
17@@ -1,27 +0,0 @@
18-<html tal:define="main load: main.pt" metal:use-macro="main.macros['page']">
19- <body>
20-
21-<metal:block metal:fill-slot="content">
22- <div class="row no-border">
23- <h1>Charm Errors</h1>
24- <p class="note">${len(charms)} errors</p>
25- <table>
26- <thead>
27- <tr>
28- <th>Charm</th>
29- <th>Errors</th>
30- </tr>
31- </thead>
32- <tr tal:repeat="charm charms">
33- <td><a href="${charm.short_url}">${charm.store_url}</a></td>
34- <td>
35- <ul>
36- <li tal:repeat="msg format_proof(charm)" tal:content="msg"></li>
37- </ul>
38- </td>
39- </tr>
40- </table>
41- </div>
42-</metal:block>
43-</body>
44-</html>
45
46=== removed file 'charmworld/templates/store-missing.pt'
47--- charmworld/templates/store-missing.pt 2013-09-03 14:15:49 +0000
48+++ charmworld/templates/store-missing.pt 1970-01-01 00:00:00 +0000
49@@ -1,27 +0,0 @@
50-<html tal:define="main load: main.pt" metal:use-macro="main.macros['page']">
51- <body>
52-
53-<metal:block metal:fill-slot="content">
54- <div class="row no-border">
55- <h1>Charm Store MIA</h1>
56- <p class="note">${len(queue)} missing</p>
57- <table>
58- <thead>
59- <tr>
60- <th>Checked</th>
61- <th>Branch Name</th>
62- <th>Store Address</th>
63- <th>Error</th>
64- </tr>
65- </thead>
66- <tr tal:repeat="charm queue">
67- <td tal:content="age_format(charm.store_data['store_checked'])"></td>
68- <td><a href="${charm.short_url}" tal:content="charm.branch_spec"></a></td>
69- <td tal:content="charm.address"></td>
70- <td tal:content="charm.store_data['errors'][0]"></td>
71- </tr>
72- </table>
73- </div>
74-</metal:block>
75-</body>
76-</html>
77
78=== modified file 'charmworld/templates/tools.pt'
79--- charmworld/templates/tools.pt 2013-09-17 14:38:22 +0000
80+++ charmworld/templates/tools.pt 2013-11-12 17:29:57 +0000
81@@ -5,8 +5,6 @@
82 <h1>Charm Tools</h1>
83 <p>Tools to manage and review charms.</p>
84 <p><a href="/tools/review-queue">Charm reviews &rsaquo;</a></p>
85- <p><a href="/tools/store-missing">Missing charms &rsaquo;</a></p>
86- <p><a href="/tools/proof-errors">Charm errors &rsaquo;</a></p>
87 </div>
88 </metal:block>
89 </body>
90
91=== modified file 'charmworld/views/tests/test_tools.py'
92--- charmworld/views/tests/test_tools.py 2013-11-08 14:32:04 +0000
93+++ charmworld/views/tests/test_tools.py 2013-11-12 17:29:57 +0000
94@@ -13,7 +13,6 @@
95 )
96 from charmworld.views.tools import (
97 charm_review,
98- charm_store_missing,
99 format_items_for_queue,
100 get_missing_qa_items,
101 get_sparklines,
102@@ -164,19 +163,3 @@
103 entry['item'], 'http://code.launchpad.net/%s' % charm.branch_spec)
104 self.assertEqual(
105 entry['summary'], 'Store error on %s' % charm.name)
106-
107-
108-class CharmStoreMissingTestCase(ViewTestBase):
109-
110- def test_charms_with_store_errors(self):
111- ignore, charm_1 = factory.makeCharm(self.db, charm_error=True)
112- factory.makeCharm(self.db, charm_error=False)
113- response = charm_store_missing(self.getRequest())
114- charm = Charm(charm_1)
115- self.assertEqual([charm], response['queue'])
116-
117- def test_obsolete_charms_ignored(self):
118- ignore, charm_1 = factory.makeCharm(self.db, charm_error=True,
119- series='oneiric')
120- response = charm_store_missing(self.getRequest())
121- self.assertEqual([], response['queue'])
122
123=== modified file 'charmworld/views/tools.py'
124--- charmworld/views/tools.py 2013-11-07 15:09:29 +0000
125+++ charmworld/views/tools.py 2013-11-12 17:29:57 +0000
126@@ -11,7 +11,6 @@
127 CharmSource,
128 QADataSource,
129 )
130-from charmworld.views.helpers import format_proof
131
132
133 # 3m
134@@ -143,30 +142,3 @@
135 'mean': mean_latency,
136 'min': min_latency,
137 'sparklines': sparklines}
138-
139-
140-# TODO After the store errors in review queue are approved as the way to deal
141-# with reviewing charm store errors, this view can go away.
142-@view_config(
143- route_name="tools-store-missing",
144- http_cache=REPORT_CACHE,
145- renderer="charmworld:templates/store-missing.pt")
146-def charm_store_missing(request):
147- queue = list(CharmSource.from_request(request).find_mia_charms())
148- return {'queue': queue, 'age_format': utils.pretty_timedelta}
149-
150-
151-# TODO After the proofs in review queue are approved as the way to deal with
152-# reviewing charm proof errors, this view can go away.
153-@view_config(
154- route_name="tools-proof-errors",
155- http_cache=REPORT_CACHE,
156- renderer="charmworld:templates/charm-proof-errors.pt")
157-def proof_errors(request):
158- source = CharmSource.from_request(request)
159- charms = list(source.find_proof_error_charms())
160-
161- return {
162- 'charms': charms,
163- 'format_proof': format_proof,
164- }

Subscribers

People subscribed via source and target branches

to all changes: