Canonical Click Reviewers tools

Merge lp:~mardy/click-reviewers-tools/oa-framework into lp:click-reviewers-tools

  1. oa-framework
  2. Merge into trunk
Proposed by Alberto Mardegan on 2015-11-25
Status: Merged
Merged at revision: 553
Proposed branch: lp:~mardy/click-reviewers-tools/oa-framework
Merge into: lp:click-reviewers-tools
Diff against target: 46 lines (+5/-5)
2 files modified
clickreviews/cr_online_accounts.py (+3/-3)
clickreviews/tests/test_cr_online_accounts.py (+2/-2)
To merge this branch: bzr merge lp:~mardy/click-reviewers-tools/oa-framework
Reviewer Review Type Date Requested Status
Jamie Strandboge 2015-11-25 Approve on 2015-11-30
Review via email: mp+278594@code.launchpad.net

Commit Message

Allow "accounts" hook since the 15.04.1 framework.

Description of the Change

Allow "accounts" hook since the 15.04.1 framework.

To post a comment you must log in.
lp:~mardy/click-reviewers-tools/oa-framework updated on 2015-11-27
554. By Alberto Mardegan on 2015-11-27

Increase grace time for one cycle

Jamie Strandboge (jdstrand) wrote :

Looks good. Thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clickreviews/cr_online_accounts.py'
2--- clickreviews/cr_online_accounts.py 2015-11-24 12:13:36 +0000
3+++ clickreviews/cr_online_accounts.py 2015-11-27 09:05:10 +0000
4@@ -162,17 +162,17 @@
5 if not framework.startswith("ubuntu-sdk"):
6 return
7 t = "error"
8- if framework < "ubuntu-sdk-15.10":
9+ if framework < "ubuntu-sdk-15.04.1":
10 for app in sorted(self.accounts.keys()):
11 for hook in self.accounts[app].keys():
12 if hook == "accounts":
13 n = self._get_check_name('%s_hook' % hook, app=app)
14- s = "'accounts' hook is not available in '%s' (must be 15.10 or later)" % \
15+ s = "'accounts' hook is not available in '%s' (must be 15.04.1 or later)" % \
16 (framework)
17 self._add_result(t, n, s)
18 return
19 hook_state = "disallowed"
20- if framework < "ubuntu-sdk-16.04":
21+ if framework < "ubuntu-sdk-16.10":
22 t = "warn"
23 hook_state = "deprecated"
24 for app in sorted(self.accounts.keys()):
25
26=== modified file 'clickreviews/tests/test_cr_online_accounts.py'
27--- clickreviews/tests/test_cr_online_accounts.py 2015-10-16 02:54:07 +0000
28+++ clickreviews/tests/test_cr_online_accounts.py 2015-11-27 09:05:10 +0000
29@@ -82,7 +82,7 @@
30
31 def test_check_hooks_versions_new(self):
32 '''Test check_hooks_versions() - new hook'''
33- self.set_test_manifest("framework", "ubuntu-sdk-15.10")
34+ self.set_test_manifest("framework", "ubuntu-sdk-15.04.1")
35 self.set_test_account(self.default_appname, "accounts", dict())
36 c = ClickReviewAccounts(self.test_name)
37 c.check_hooks_versions()
38@@ -102,7 +102,7 @@
39
40 def test_check_hooks_versions_disallowed_service(self):
41 '''Test check_hooks_versions() - deprecated -service hook'''
42- self.set_test_manifest("framework", "ubuntu-sdk-16.04")
43+ self.set_test_manifest("framework", "ubuntu-sdk-16.10")
44 self.set_test_account(self.default_appname, "account-service", dict())
45 c = ClickReviewAccounts(self.test_name)
46 c.check_hooks_versions()

Subscribers

People subscribed via source and target branches