Merge lp:~dholbach/click-reviewers-tools/scope-email into lp:click-reviewers-tools

[Daniel Holbach]

[Jamie Strandboge (jdstrand)]

This look fine except it is missing a corresponding test in clickreviews/tests/test_cr_lint.py. Can you add one (eg, add test_check_maintainer_email_special2()). Thanks!

review: Needs Fixing

[lp:~dholbach/click-reviewers-tools/scope-email]

222. By Daniel Holbach on 2014-07-31

add test-case for scope maintainer email special case

Unmerged revisions

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2014-07-25 14:02:45 +0000
+++ clickreviews/cr_lint.py	2014-07-31 12:33:59 +0000
@@ -55,9 +55,16 @@
                                     'com.ubuntu.developer.')
                                 and self.email ==
                                 '[e-mail]')
+            # "core scope" is not necessarily a word we use right now, but
+            # we want to special case scopes which are written through our
+            # vetted development process.
+            self.is_core_scope = (self.click_pkgname.startswith('com.ubuntu.scopes.')
+                                  and self.email ==
+                                  '[e-mail]')
         else:
             self.email = None
             self.is_core_app = False
+            self.is_core_scope = False
 
         self._list_all_compiled_binaries()
 
@@ -548,6 +555,9 @@
                 else:
                     s = "OK (email=%s, package domain=%s)" % (self.email,
                                                               ".".join(pkg_domain_rev))
+            elif self.is_core_scope:
+                t = 'info'
+                s = "OK ('com.ubuntu.scopes' uses '%s' as email)" % self.email
             else:
                 t = 'error'
                 s = "email=%s does not match package domain=%s " \

=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2014-07-24 18:02:19 +0000
+++ clickreviews/tests/test_cr_lint.py	2014-07-31 12:33:59 +0000
@@ -527,6 +527,27 @@
              "but special case"}
         self.check_results(r, expected=expected)
 
+    def test_check_maintainer_email_special2(self):
+        '''Test check_maintainer() - [e-mail]'''
+        self.set_test_control("Package", "com.ubuntu.scopes.youtube")
+        self.set_test_manifest("maintainer",
+                               "Ubuntu Core Developers "
+                               "<[e-mail]>")
+        c = ClickReviewLint(self.test_name)
+        c.check_maintainer()
+        r = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+        expected = dict()
+        expected['info'] = dict()
+        expected['warn'] = dict()
+        expected['error'] = dict()
+        expected['info']['lint_maintainer_domain'] = \
+            {"text": "OK ('com.ubuntu.scopes' uses "
+             "'[e-mail]' as email)"}
+        self.check_results(r, expected=expected)
+
     def test_check_icon(self):
         '''Test check_icon()'''
         self.set_test_manifest("icon", "someicon")

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-30 16:33:54 +0000
+++ debian/changelog	2014-07-31 12:33:59 +0000
@@ -3,6 +3,13 @@
   [ Jamie Strandboge ]
   * data/frameworks.json: add ubuntu-sdk-14.10-qml-dev3
 
+  [ Daniel Holbach ]
+  * special-case 'com.ubuntu.scopes'.
+
+  [ Pete Woods ]
+  * Match scope review with actual ini file specifications. (LP: #1350427)
+  * Point to the correct scope ini path.
+
  -- Jamie Strandboge <[e-mail]>  Wed, 30 Jul 2014 11:31:41 -0500
 
 click-reviewers-tools (0.8) utopic; urgency=medium