diff -Nru click-reviewers-tools-0.32/clickreviews/cr_common.py click-reviewers-tools-0.33/clickreviews/cr_common.py --- click-reviewers-tools-0.32/clickreviews/cr_common.py 2015-07-09 14:23:38.000000000 +0000 +++ click-reviewers-tools-0.33/clickreviews/cr_common.py 2015-07-22 16:46:42.000000000 +0000 @@ -106,7 +106,8 @@ "security-override", "security-policy"] - def __init__(self, fn, review_type, peer_hooks=None, overrides=None): + def __init__(self, fn, review_type, peer_hooks=None, overrides=None, + peer_hooks_link=None): self.click_package = fn self._check_path_exists() if not self.click_package.endswith(".click") and \ @@ -190,6 +191,7 @@ self.peer_hooks = peer_hooks self.overrides = overrides if overrides is not None else {} + self.peer_hooks_link = peer_hooks_link def _extract_click_frameworks(self): '''Extract installed click frameworks''' @@ -469,7 +471,8 @@ for app in d['missing']: s = "Missing required hooks for '%s': %s" % ( app, ", ".join(d['missing'][app])) - self._add_result(t, n, s, manual_review=True) + self._add_result(t, n, s, manual_review=True, + link=self.peer_hooks_link) else: self._add_result(t, n, s) @@ -482,7 +485,8 @@ for app in d['disallowed']: s = "Disallowed with %s (%s): %s" % ( hook, app, ", ".join(d['disallowed'][app])) - self._add_result(t, n, s, manual_review=True) + self._add_result(t, n, s, manual_review=True, + link=self.peer_hooks_link) else: self._add_result(t, n, s) diff -Nru click-reviewers-tools-0.32/clickreviews/cr_online_accounts.py click-reviewers-tools-0.33/clickreviews/cr_online_accounts.py --- click-reviewers-tools-0.32/clickreviews/cr_online_accounts.py 2015-07-09 14:23:38.000000000 +0000 +++ click-reviewers-tools-0.33/clickreviews/cr_online_accounts.py 2015-07-22 16:46:42.000000000 +0000 @@ -54,8 +54,12 @@ peer_hooks['account-qml-plugin']['allowed'] = \ peer_hooks['account-qml-plugin']['required'] - ClickReview.__init__(self, fn, "online_accounts", peer_hooks=peer_hooks, - overrides=overrides) + ClickReview.__init__(self, + fn, + "online_accounts", + peer_hooks=peer_hooks, + overrides=overrides, + peer_hooks_link="https://wiki.ubuntu.com/SecurityTeam/Specifications/OnlineAccountsConfinement") self.accounts_files = dict() self.accounts = dict() @@ -181,7 +185,7 @@ if t == 'error': continue - for tag in ['type', 'name', 'provider']: + for tag in ['name', 'provider']: t = 'info' n = '%s_%s_%s' % (app, account_type, tag) s = "OK" diff -Nru click-reviewers-tools-0.32/clickreviews/tests/test_cr_online_accounts.py click-reviewers-tools-0.33/clickreviews/tests/test_cr_online_accounts.py --- click-reviewers-tools-0.32/clickreviews/tests/test_cr_online_accounts.py 2015-07-09 14:23:38.000000000 +0000 +++ click-reviewers-tools-0.33/clickreviews/tests/test_cr_online_accounts.py 2015-07-22 16:46:42.000000000 +0000 @@ -60,8 +60,6 @@ else: xml = etree.Element(root, id="%s" % id) if do_subtree: - service_type = etree.SubElement(xml, "type") - service_type.text = "webapps" service_name = etree.SubElement(xml, "name") service_name.text = "Foo" service_provider = etree.SubElement(xml, "provider") @@ -167,7 +165,7 @@ c = ClickReviewAccounts(self.test_name) c.check_service() r = c.click_report - expected_counts = {'info': 5, 'warn': 0, 'error': 0} + expected_counts = {'info': 4, 'warn': 0, 'error': 0} self.check_results(r, expected_counts) def test_check_service_not_specified(self): @@ -203,27 +201,9 @@ expected_counts = {'info': None, 'warn': 0, 'error': 1} self.check_results(r, expected_counts) - def test_check_service_missing_type(self): - '''Test check_service() - missing type''' - xml = self._stub_service(do_subtree=False) - service_name = etree.SubElement(xml, "name") - service_name.text = "Foo" - service_provider = etree.SubElement(xml, "provider") - service_provider.text = "some-provider" - self.set_test_account(self.default_appname, "account-service", xml) - xml = self._stub_application() - self.set_test_account(self.default_appname, "account-application", xml) - c = ClickReviewAccounts(self.test_name) - c.check_service() - r = c.click_report - expected_counts = {'info': None, 'warn': 0, 'error': 1} - self.check_results(r, expected_counts) - def test_check_service_missing_name(self): '''Test check_service() - missing name''' xml = self._stub_service(do_subtree=False) - service_type = etree.SubElement(xml, "type") - service_type.text = "webapps" service_provider = etree.SubElement(xml, "provider") service_provider.text = "some-provider" self.set_test_account(self.default_appname, "account-service", xml) @@ -238,8 +218,6 @@ def test_check_service_missing_provider(self): '''Test check_service() - missing provider''' xml = self._stub_service(do_subtree=False) - service_type = etree.SubElement(xml, "type") - service_type.text = "webapps" service_name = etree.SubElement(xml, "name") service_name.text = "Foo" self.set_test_account(self.default_appname, "account-service", xml) diff -Nru click-reviewers-tools-0.32/debian/bzr-builder.manifest click-reviewers-tools-0.33/debian/bzr-builder.manifest --- click-reviewers-tools-0.32/debian/bzr-builder.manifest 2015-07-09 14:23:38.000000000 +0000 +++ click-reviewers-tools-0.33/debian/bzr-builder.manifest 2015-07-22 16:46:42.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~503 -lp:click-reviewers-tools revid:jamie@ubuntu.com-20150709140411-ns4zjp161f63s9sm +# bzr-builder format 0.3 deb-version {debupstream}-0~505 +lp:click-reviewers-tools revid:jamie@ubuntu.com-20150722163036-edp082n6ylthbzq7 diff -Nru click-reviewers-tools-0.32/debian/changelog click-reviewers-tools-0.33/debian/changelog --- click-reviewers-tools-0.32/debian/changelog 2015-07-09 14:23:38.000000000 +0000 +++ click-reviewers-tools-0.33/debian/changelog 2015-07-22 16:46:42.000000000 +0000 @@ -1,8 +1,24 @@ -click-reviewers-tools (0.32-0~503~ubuntu14.04.1) trusty; urgency=low +click-reviewers-tools (0.33-0~505~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Daniel Holbach Thu, 09 Jul 2015 14:23:38 +0000 + -- Daniel Holbach Wed, 22 Jul 2015 16:46:42 +0000 + +click-reviewers-tools (0.33) UNRELEASED; urgency=medium + + [ Alberto Mardegan ] + * clickreviews/cr_online_accounts.py: Do not check for "type" element in OA + .service files + + [ Jamie Strandboge ] + * clickreviews/cr_common.py: add peer_hooks_link to __init__ and use it + as the link for missing and disallowed hooks + * clickreviews/cr_online_accounts.py: set peer_hooks_link to use + https://wiki.ubuntu.com/SecurityTeam/Specifications/OnlineAccountsConfinement + * clickreviews/tests/test_cr_online_accounts.py: don't stub or check for + "type" element in OA .service files + + -- Jamie Strandboge Wed, 22 Jul 2015 11:30:07 -0500 click-reviewers-tools (0.32) wily; urgency=medium