queuebot

Merge lp:~robru/queuebot/bileto-v2 into lp:queuebot

  1. bileto-v2
  2. Merge into queuebot
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 111
Proposed branch: lp:~robru/queuebot/bileto-v2
Merge into: lp:queuebot
Diff against target: 67 lines (+16/-16)
1 file modified
plugins/landing.py (+16/-16)
To merge this branch: bzr merge lp:~robru/queuebot/bileto-v2
Reviewer Review Type Date Requested Status
Stéphane Graber Pending
Review via email: mp+309535@code.launchpad.net

Description of the change

"requests" terminology is archaic, rename variables to use "ticket" instead, with an accompanying bileto API upgrade.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/landing.py'
2--- plugins/landing.py 2016-10-25 22:46:04 +0000
3+++ plugins/landing.py 2016-10-28 07:57:41 +0000
4@@ -6,7 +6,7 @@
5 import json
6
7 ROOT = "https://bileto.ubuntu.com/"
8-URL = ROOT + "v1/active"
9+URL = ROOT + "v2/active"
10
11 PERMALINK = "{}#/ticket/{{id}}".format(ROOT)
12 TESTED = "{{landers}}, {} QA Signoff: {{qa_signoff}}".format(PERMALINK)
13@@ -26,31 +26,31 @@
14 print("Unable to read from Bileto: {}".format(e))
15 return
16
17- request_list = data.get('requests', [])
18- request_dict = {req['id']: req for req in request_list}
19- for rid, req in request_dict.items():
20- req['status'] = req['status'].strip('. ')
21- old_req = self.requests.get(rid)
22- if not old_req:
23+ ticket_list = data.get('tickets', [])
24+ ticket_dict = {ticket['id']: ticket for ticket in ticket_list}
25+ for ticket_id, ticket in ticket_dict.items():
26+ ticket['status'] = ticket['status'].strip('. ')
27+ old_ticket = self.tickets.get(ticket_id)
28+ if not old_ticket:
29 continue # Don't spam message if old version not cached.
30
31- if req['qa_signoff'] != old_req['qa_signoff']:
32- self.notices.append((TESTED.format(**req), (self.queue,)))
33- if req['status'] != old_req['status']:
34- msg = req['status'].lower()
35+ if ticket['qa_signoff'] != old_ticket['qa_signoff']:
36+ self.notices.append((TESTED.format(**ticket), (self.queue,)))
37+ if ticket['status'] != old_ticket['status']:
38+ msg = ticket['status'].lower()
39 if 'currently building' not in msg or 'fail' in msg:
40 self.notices.append(
41- (STATUS.format(**req), (self.queue,)))
42+ (STATUS.format(**ticket), (self.queue,)))
43
44- self.requests.clear()
45- self.requests.update(request_dict)
46+ self.tickets.clear()
47+ self.tickets.update(ticket_dict)
48 except:
49 # We don't want the bot to crash when something fails
50 traceback.print_exc()
51
52
53 class Landing():
54- requests = dict()
55+ tickets = dict()
56 scanner = LandingScanner()
57 name = "landing"
58 queue = ""
59@@ -66,7 +66,7 @@
60 raise Exception("Scanner is already running")
61
62 self.scanner = LandingScanner()
63- self.scanner.requests = self.requests
64+ self.scanner.tickets = self.tickets
65 self.scanner.verbose = self.verbose
66 self.scanner.queue = self.queue
67 self.scanner.start()

Subscribers

People subscribed via source and target branches