Merge lp:~ricardokirkner/click-reviewers-tools/click-check-overrides into lp:click-reviewers-tools

[Ricardo Kirkner]

support overrides in all click-check scripts

[Jamie Strandboge (jdstrand)]

Thanks!

This looks mostly good, but the change to click-run-checks isn't quite right. See comments inline.

review: Needs Fixing

[lp:~ricardokirkner/click-reviewers-tools/click-check-overrides]

413. By Ricardo Kirkner on 2015-03-18

handle checks from branch as well as installed system-wide when running all checks

[Jamie Strandboge (jdstrand)]

review: Approve

=== modified file 'bin/click-check-bin-path'
--- bin/click-check-bin-path	2014-11-20 15:23:28 +0000
+++ bin/click-check-bin-path	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-bin-path: perform click bin-path checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_bin_path as cr_bin_path
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_bin_path.ClickReviewBinPath(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_bin_path.ClickReviewBinPath)

=== modified file 'bin/click-check-content-hub'
--- bin/click-check-content-hub	2014-07-14 18:48:37 +0000
+++ bin/click-check-content-hub	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-content-hub: perform click content-hub checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_content_hub as cr_content_hub
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_content_hub.ClickReviewContentHub(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_content_hub.ClickReviewContentHub)

=== modified file 'bin/click-check-desktop'
--- bin/click-check-desktop	2013-10-01 13:20:41 +0000
+++ bin/click-check-desktop	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-desktop: perform click desktop checks'''
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 from clickreviews import cr_common
 from clickreviews import cr_desktop
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_desktop.ClickReviewDesktop(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_desktop.ClickReviewDesktop)

=== modified file 'bin/click-check-framework'
--- bin/click-check-framework	2014-11-20 23:22:15 +0000
+++ bin/click-check-framework	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-framework: perform click framework checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_framework as cr_framework
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_framework.ClickReviewFramework(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_framework.ClickReviewFramework)

=== modified file 'bin/click-check-functional'
--- bin/click-check-functional	2013-09-27 20:20:25 +0000
+++ bin/click-check-functional	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-functional: perform functional checks on click packages'''
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_functional as cr_functional
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_functional.ClickReviewFunctional(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_functional.ClickReviewFunctional)

=== modified file 'bin/click-check-lint'
--- bin/click-check-lint	2014-11-14 14:32:39 +0000
+++ bin/click-check-lint	2015-03-18 20:49:53 +0000
@@ -16,24 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import json
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_lint as cr_lint
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    # extract args
-    fn = sys.argv[1]
-    if len(sys.argv) > 2:
-        overrides = json.loads(sys.argv[2])
-    else:
-        overrides = None
-
-    review = cr_lint.ClickReviewLint(fn, overrides=overrides)
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_lint.ClickReviewLint)

=== modified file 'bin/click-check-online-accounts'
--- bin/click-check-online-accounts	2014-07-15 23:25:01 +0000
+++ bin/click-check-online-accounts	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-online-accounts: perform click online accounts checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_online_accounts as cr_online_accounts
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_online_accounts.ClickReviewAccounts(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_online_accounts.ClickReviewAccounts)

=== modified file 'bin/click-check-push-helper'
--- bin/click-check-push-helper	2014-07-21 21:52:48 +0000
+++ bin/click-check-push-helper	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-push-helper: perform click push-helper checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_push_helper as cr_push_helper
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_push_helper.ClickReviewPushHelper(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_push_helper.ClickReviewPushHelper)

=== modified file 'bin/click-check-scope'
--- bin/click-check-scope	2014-07-14 18:48:37 +0000
+++ bin/click-check-scope	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-scope: perform click scope checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_scope as cr_scope
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_scope.ClickReviewScope(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_scope.ClickReviewScope)

=== modified file 'bin/click-check-security'
--- bin/click-check-security	2014-11-14 14:32:39 +0000
+++ bin/click-check-security	2015-03-18 20:49:53 +0000
@@ -16,24 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import json
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_security as cr_security
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    # extract args
-    fn = sys.argv[1]
-    if len(sys.argv) > 2:
-        overrides = json.loads(sys.argv[2])
-    else:
-        overrides = None
-
-    review = cr_security.ClickReviewSecurity(fn, overrides=overrides)
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_security.ClickReviewSecurity)

=== modified file 'bin/click-check-skeleton'
--- bin/click-check-skeleton	2013-09-26 12:24:10 +0000
+++ bin/click-check-skeleton	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-skeleton: perform click skeleton checks'''
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_skeleton as cr_skeleton
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_skeleton.ClickReviewSkeleton(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_skeleton.ClickReviewSkeleton)

=== modified file 'bin/click-check-systemd'
--- bin/click-check-systemd	2015-03-18 19:29:09 +0000
+++ bin/click-check-systemd	2015-03-18 20:49:53 +0000
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_systemd as cr_systemd
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_systemd.ClickReviewSystemd(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_systemd.ClickReviewSystemd)

=== modified file 'bin/click-check-url-dispatcher'
--- bin/click-check-url-dispatcher	2014-07-14 18:48:37 +0000
+++ bin/click-check-url-dispatcher	2015-03-18 20:49:53 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 '''click-check-url_dispatcher: perform click url dispatcher checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
-import sys
 
 import clickreviews.cr_common as cr_common
 import clickreviews.cr_url_dispatcher as cr_url_dispatcher
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        cr_common.error("Must give path to click package")
-
-    review = cr_url_dispatcher.ClickReviewUrlDispatcher(sys.argv[1])
-    review.do_checks()
-    rc = review.do_report()
-    sys.exit(rc)
+    cr_common.run_click_check(cr_url_dispatcher.ClickReviewUrlDispatcher)

=== modified file 'bin/click-run-checks'
--- bin/click-run-checks	2015-03-18 19:29:09 +0000
+++ bin/click-run-checks	2015-03-18 20:49:53 +0000
@@ -11,8 +11,10 @@
 fi
 
 # prefer local script for testing, otherwise use system location
+CLICK_CHECKS_BIN_PATH="$(dirname $(readlink -f "$0"))"
+
 prefer_local() {
-    path="$(dirname $(readlink -f "$0"))/$1"
+    path="${CLICK_CHECKS_BIN_PATH}/$1"
     if [ -x $path ]; then
         "$path" "$2" || set_rc "$?"
         return
@@ -35,53 +37,14 @@
 
 prefer_local click-show-files "$c"
 
-echo ""
-echo "= click-check-lint ="
-prefer_local click-check-lint "$c"
-
-echo ""
-echo "= click-check-bin-path ="
-prefer_local click-check-bin-path "$c"
-
-echo ""
-echo "= click-check-content-hub ="
-prefer_local click-check-content-hub "$c"
-
-echo ""
-echo "= click-check-desktop ="
-prefer_local click-check-desktop "$c"
-
-echo ""
-echo "= click-check-framework ="
-prefer_local click-check-framework "$c"
-
-echo ""
-echo "= click-check-functional ="
-prefer_local click-check-functional "$c"
-
-echo ""
-echo "= click-check-online-accounts ="
-prefer_local click-check-online-accounts "$c"
-
-echo ""
-echo "= click-check-push-helper ="
-prefer_local click-check-push-helper "$c"
-
-echo ""
-echo "= click-check-scope ="
-prefer_local click-check-scope "$c"
-
-echo ""
-echo "= click-check-security ="
-prefer_local click-check-security "$c"
-
-echo ""
-echo "= click-check-systemd ="
-prefer_local click-check-systemd "$c"
-
-echo ""
-echo "= click-check-url-dispatcher ="
-prefer_local click-check-url-dispatcher "$c"
+CLICK_CHECKS=$(ls ${CLICK_CHECKS_BIN_PATH}/click-check-* | grep -v click-check-skeleton | grep -v click-check-lint)
+CLICK_CHECKS="click-check-lint ${CLICK_CHECKS}"
+for check_path in ${CLICK_CHECKS}; do
+    check=$(basename ${check_path} ${CLICK_CHECKS_BIN_PATH})
+    echo ""
+    echo "=" $check "="
+    prefer_local $check "$c"
+done
 
 echo ""
 echo ""

=== modified file 'clickreviews/cr_bin_path.py'
--- clickreviews/cr_bin_path.py	2015-03-09 18:29:49 +0000
+++ clickreviews/cr_bin_path.py	2015-03-18 20:49:53 +0000
@@ -22,14 +22,15 @@
 
 class ClickReviewBinPath(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'bin-path'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['required'] = ["apparmor"]
         peer_hooks[my_hook]['allowed'] = peer_hooks[my_hook]['required']
 
-        ClickReview.__init__(self, fn, "bin-path", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "bin-path", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.bin_paths = dict()
         for app in self.manifest['hooks']:

=== modified file 'clickreviews/cr_common.py'
--- clickreviews/cr_common.py	2015-03-09 15:09:31 +0000
+++ clickreviews/cr_common.py	2015-03-18 20:49:53 +0000
@@ -95,7 +95,7 @@
                        "vendor",  # replaces maintainer
                        ]
 
-    def __init__(self, fn, review_type, peer_hooks=None):
+    def __init__(self, fn, review_type, peer_hooks=None, overrides=None):
         self.click_package = fn
         self._check_path_exists()
         if not self.click_package.endswith(".click") and \
@@ -164,6 +164,7 @@
         self.valid_frameworks = self._extract_click_frameworks()
 
         self.peer_hooks = peer_hooks
+        self.overrides = overrides if overrides is not None else {}
 
     def _extract_click_frameworks(self):
         '''Extract installed click frameworks'''
@@ -609,3 +610,20 @@
             recursive_rm(path)
     if contents_only is False:
         os.rmdir(dirPath)
+
+
+def run_click_check(cls):
+    if len(sys.argv) < 2:
+        error("Must give path to click package")
+
+    # extract args
+    fn = sys.argv[1]
+    if len(sys.argv) > 2:
+        overrides = json.loads(sys.argv[2])
+    else:
+        overrides = None
+
+    review = cls(fn, overrides=overrides)
+    review.do_checks()
+    rc = review.do_report()
+    sys.exit(rc)

=== modified file 'clickreviews/cr_content_hub.py'
--- clickreviews/cr_content_hub.py	2014-11-21 18:23:51 +0000
+++ clickreviews/cr_content_hub.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_content_hub.py: click content-hub checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,14 +23,15 @@
 
 class ClickReviewContentHub(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'content-hub'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ClickReview.app_allowed_peer_hooks
         peer_hooks[my_hook]['required'] = []
 
-        ClickReview.__init__(self, fn, "content_hub", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "content_hub", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.valid_keys = ['destination', 'share', 'source']
 

=== modified file 'clickreviews/cr_desktop.py'
--- clickreviews/cr_desktop.py	2015-02-02 16:00:04 +0000
+++ clickreviews/cr_desktop.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_desktop.py: click desktop checks'''
 #
-# Copyright (C) 2013-2014 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,14 +28,15 @@
 
 class ClickReviewDesktop(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'desktop'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ClickReview.app_allowed_peer_hooks
         peer_hooks[my_hook]['required'] = ["apparmor"]
 
-        ClickReview.__init__(self, fn, "desktop", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "desktop", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.desktop_files = dict()  # click-show-files and a couple tests
         self.desktop_entries = dict()

=== modified file 'clickreviews/cr_framework.py'
--- clickreviews/cr_framework.py	2014-11-21 18:22:56 +0000
+++ clickreviews/cr_framework.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_framework.py: click framework'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,13 +22,14 @@
 
 class ClickReviewFramework(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'framework'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ClickReview.framework_allowed_peer_hooks
         peer_hooks[my_hook]['required'] = peer_hooks[my_hook]['allowed']
-        ClickReview.__init__(self, fn, "framework", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "framework", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.frameworks_file = dict()
         self.frameworks = dict()

=== modified file 'clickreviews/cr_functional.py'
--- clickreviews/cr_functional.py	2014-07-14 16:00:54 +0000
+++ clickreviews/cr_functional.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_functional.py: click functional'''
 #
-# Copyright (C) 2013-2014 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 
 class ClickReviewFunctional(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
-        ClickReview.__init__(self, fn, "functional")
+    def __init__(self, fn, overrides=None):
+        ClickReview.__init__(self, fn, "functional", overrides=overrides)
 
         self.qml_files = []
         for i in self.pkg_files:

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2015-03-18 16:26:11 +0000
+++ clickreviews/cr_lint.py	2015-03-18 20:49:53 +0000
@@ -33,7 +33,7 @@
 
     def __init__(self, fn, overrides=None):
         '''Set up the class.'''
-        ClickReview.__init__(self, fn, "lint")
+        ClickReview.__init__(self, fn, "lint", overrides=overrides)
         self.control_files = dict()
         self._list_control_files()
         # Valid values for Architecture in DEBIAN/control. Note:
@@ -118,10 +118,6 @@
                                         # 'oem',           # TBI
                                         ]
 
-        if overrides is None:
-            overrides = {}
-        self.overrides = overrides
-
     def _list_control_files(self):
         '''List all control files with their full path.'''
         for i in CONTROL_FILE_NAMES:

=== modified file 'clickreviews/cr_online_accounts.py'
--- clickreviews/cr_online_accounts.py	2014-11-24 23:03:00 +0000
+++ clickreviews/cr_online_accounts.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_online_accounts.py: click online accounts'''
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 class ClickReviewAccounts(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         peer_hooks['account-application'] = dict()
         peer_hooks['account-application']['allowed'] = \
@@ -54,7 +54,8 @@
         peer_hooks['account-qml-plugin']['allowed'] = \
             peer_hooks['account-qml-plugin']['required']
 
-        ClickReview.__init__(self, fn, "online_accounts", peer_hooks)
+        ClickReview.__init__(self, fn, "online_accounts", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.accounts_files = dict()
         self.accounts = dict()

=== modified file 'clickreviews/cr_push_helper.py'
--- clickreviews/cr_push_helper.py	2014-11-21 18:47:07 +0000
+++ clickreviews/cr_push_helper.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_push_helper.py: click push-helper checks'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,14 +23,15 @@
 
 class ClickReviewPushHelper(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'push-helper'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ['apparmor']
         peer_hooks[my_hook]['required'] = ['apparmor']
 
-        ClickReview.__init__(self, fn, "push_helper", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "push_helper", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.required_keys = ['exec']
         self.optional_keys = ['app_id']

=== modified file 'clickreviews/cr_scope.py'
--- clickreviews/cr_scope.py	2015-01-20 13:35:35 +0000
+++ clickreviews/cr_scope.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_scope.py: click scope'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,14 +30,15 @@
 
 class ClickReviewScope(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'scope'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ClickReview.scope_allowed_peer_hooks
         peer_hooks[my_hook]['required'] = ['apparmor']
 
-        ClickReview.__init__(self, fn, "scope", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "scope", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.scopes = dict()
         for app in self.manifest['hooks']:

=== modified file 'clickreviews/cr_security.py'
--- clickreviews/cr_security.py	2015-03-03 22:28:38 +0000
+++ clickreviews/cr_security.py	2015-03-18 20:49:53 +0000
@@ -43,7 +43,8 @@
             ClickReview.service_allowed_peer_hooks
         peer_hooks[my_hook2]['required'] = []
 
-        ClickReview.__init__(self, fn, "security", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "security", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         local_copy = os.path.join(os.path.dirname(__file__),
                                   '../data/apparmor-easyprof-ubuntu.json')
@@ -111,9 +112,7 @@
                 'policy_version': 1.3,
             },
         }
-        if overrides is None:
-            overrides = {}
-        framework_overrides = overrides.get('framework', {})
+        framework_overrides = self.overrides.get('framework', {})
         self._override_framework_policies(framework_overrides)
 
         self.security_manifests = dict()

=== modified file 'clickreviews/cr_skeleton.py'
--- clickreviews/cr_skeleton.py	2014-11-21 16:55:50 +0000
+++ clickreviews/cr_skeleton.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_skeleton.py: click skeleton'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 class ClickReviewSkeleton(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         # Many test classes are for verify click hooks. 'peer_hooks' is used
         # to declare what hooks may be use with my_hook. When using this
         # mechanism, ClickReview.check_peer_hooks() is run for you.
@@ -31,7 +31,8 @@
         peer_hooks[my_hook]['allowed'] = ["desktop", "apparmor", "urls"]
         peer_hooks[my_hook]['required'] = ["desktop", "apparmor"]
 
-        ClickReview.__init__(self, fn, "skeleton", peer_hooks)
+        ClickReview.__init__(self, fn, "skeleton", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         # If not a hooks test, skip the above and omit peer_hooks like so:
         # ClickReview.__init__(self, fn, "skeleton")

=== modified file 'clickreviews/cr_systemd.py'
--- clickreviews/cr_systemd.py	2015-03-09 19:53:11 +0000
+++ clickreviews/cr_systemd.py	2015-03-18 20:49:53 +0000
@@ -23,14 +23,15 @@
 
 class ClickReviewSystemd(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'snappy-systemd'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['required'] = ["apparmor"]
         peer_hooks[my_hook]['allowed'] = peer_hooks[my_hook]['required']
 
-        ClickReview.__init__(self, fn, "snappy-systemd", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "snappy-systemd", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         # snappy-systemd currently only allows specifying:
         # - start (required)

=== modified file 'clickreviews/cr_url_dispatcher.py'
--- clickreviews/cr_url_dispatcher.py	2014-11-21 19:18:55 +0000
+++ clickreviews/cr_url_dispatcher.py	2015-03-18 20:49:53 +0000
@@ -1,6 +1,6 @@
 '''cr_url dispatcher.py: click url_dispatcher'''
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2015 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,14 +25,15 @@
 
 class ClickReviewUrlDispatcher(ClickReview):
     '''This class represents click lint reviews'''
-    def __init__(self, fn):
+    def __init__(self, fn, overrides=None):
         peer_hooks = dict()
         my_hook = 'urls'
         peer_hooks[my_hook] = dict()
         peer_hooks[my_hook]['allowed'] = ClickReview.app_allowed_peer_hooks
         peer_hooks[my_hook]['required'] = []
 
-        ClickReview.__init__(self, fn, "url_dispatcher", peer_hooks=peer_hooks)
+        ClickReview.__init__(self, fn, "url_dispatcher", peer_hooks=peer_hooks,
+                             overrides=overrides)
 
         self.required_keys = ['protocol']
         self.optional_keys = ['domain-suffix']