Merge lp:~ricardokirkner/click-reviewers-tools/handle-malformed-overrides-data into lp:click-reviewers-tools

[Ricardo Kirkner]

handle case when overrides data is malformed

[Jamie Strandboge (jdstrand)]

Looks good. Thanks!

review: Approve

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2014-11-20 13:03:51 +0000
+++ clickreviews/cr_lint.py	2014-11-20 18:46:46 +0000
@@ -94,7 +94,9 @@
                             'urls']
 
         self.redflagged_hooks = ['pay-ui']
-        self.overrides = overrides if overrides is not None else {}
+        if overrides is None:
+            overrides = {}
+        self.overrides = overrides
 
     def _list_control_files(self):
         '''List all control files with their full path.'''
@@ -652,7 +654,7 @@
         '''Check framework()'''
         n = 'framework'
         l = "http://askubuntu.com/questions/460512/what-framework-should-i-use-in-my-manifest-file"
-        framework_overrides = self.overrides.get('framework')
+        framework_overrides = self.overrides.get('framework', {})
         frameworks = Frameworks(overrides=framework_overrides)
         if self.manifest['framework'] in frameworks.AVAILABLE_FRAMEWORKS:
             t = 'info'
 
=== modified file 'clickreviews/cr_security.py'
--- clickreviews/cr_security.py	2014-11-17 17:12:00 +0000
+++ clickreviews/cr_security.py	2014-11-20 18:46:46 +0000
@@ -89,7 +89,9 @@
                 'policy_version': 1.2,
             },
         }
-        framework_overrides = overrides.get('framework') if overrides else {}
+        if overrides is None:
+            overrides = {}
+        framework_overrides = overrides.get('framework', {})
         self._override_framework_policies(framework_overrides)
 
         self.security_manifests = dict()
 
=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2014-11-20 13:02:37 +0000
+++ clickreviews/tests/test_cr_lint.py	2014-11-20 18:46:46 +0000
@@ -787,6 +787,20 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    @patch('clickreviews.remote.read_cr_file')
+    def test_check_framework_with_malformed_overrides(self, mock_read_cr_file):
+        '''Test check_framework() - using overrides'''
+        mock_read_cr_file.return_value = {
+            'ubuntu-sdk-14.10-qml-dev2': 'available',
+        }
+        self.set_test_manifest("framework", "nonexistent")
+        overrides = {'nonexistent': {'state': 'available'}}
+        c = ClickReviewLint(self.test_name, overrides=overrides)
+        c.check_framework()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 1}
+        self.check_results(r, expected_counts)
+
     def test_check_hooks(self):
         '''Test check_hooks()'''
         self.set_test_manifest("framework", "ubuntu-sdk-13.10")
 
=== modified file 'clickreviews/tests/test_cr_security.py'
--- clickreviews/tests/test_cr_security.py	2014-11-17 17:12:00 +0000
+++ clickreviews/tests/test_cr_security.py	2014-11-20 18:46:46 +0000
@@ -224,6 +224,21 @@
         expected_counts = {'info': 3, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_policy_version_framework_with_malformed_overrides(self):
+        '''Test check_policy_version() - incorrectly override framework'''
+        self.set_test_manifest("framework", "nonexistent")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_version", 1.3)
+        overrides = {'nonexistent': {'state': 'available',
+                                     'policy_vendor': 'ubuntu',
+                                     'policy_version': 1.3}}
+        c = ClickReviewSecurity(self.test_name, overrides=overrides)
+        c.check_policy_version()
+        report = c.click_report
+
+        expected_counts = {'info': 1, 'warn': 0, 'error': 2}
+        self.check_results(report, expected_counts)
+
     def test_check_policy_vendor_unspecified(self):
         '''Test check_policy_vendor() - unspecified'''
         c = ClickReviewSecurity(self.test_name)