Merge lp:~james-w/click-reviewers-tools/drop-name-check into lp:click-reviewers-tools

[James Westby]

Drop the checks on the package name in the filename.

The filename doesn't matter, and the store generates it anyway,
so checking it is a waste, and keeps breaking as we change the
rules.

[Martin Albisetti (beuno)]

review: Approve

[Daniel Holbach (dholbach)]

Makes sense, thanks!

review: Approve

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2015-04-10 16:22:20 +0000
+++ clickreviews/cr_lint.py	2015-04-15 20:57:04 +0000
@@ -707,39 +707,6 @@
                 click_package_bn
         self._add_result(t, n, s)
 
-        #  handle $pkgname.click or $pkgname.snap
-        if self.click_package.endswith('.snap'):
-            pkgname = tmp[0].partition('.snap')[0]
-        else:
-            pkgname = tmp[0].partition('.click')[0]
-        t = 'info'
-        n = 'package_filename_pkgname_match'
-        s = 'OK'
-        l = None
-        if pkgname != self.click_pkgname:
-            if pkgname.startswith('com.ubuntu.snappy.') or \
-               click_package_bn.startswith('com.ubuntu.snappy.'):
-                s = "OK (store snappy workaround)"
-            else:
-                t = 'error'
-                s = "'%s' != '%s' from DEBIAN/control" % (pkgname,
-                                                          self.click_pkgname)
-                l = 'http://askubuntu.com/questions/417361/what-does-lint-package-filename-pkgname-match-mean'
-        self._add_result(t, n, s, l)
-
-        # check if namespaces matches with filename
-        t = 'info'
-        n = 'package_filename_matches_namespace'
-        s = 'OK'
-        namespace_bits = self.click_pkgname.split('.')[:-1]
-        len_namespace = len(namespace_bits)
-        pkgname_bits = pkgname.split('.')[:len_namespace]
-        if namespace_bits != pkgname_bits:
-            t = 'error'
-            s = "Package name '%s' does not match namespace '%s'." % \
-                ('.'.join(namespace_bits), '.'.join(pkgname_bits))
-        self._add_result(t, n, s)
-
         t = 'info'
         n = 'package_filename_version_match'
         s = 'OK'

=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2015-04-10 10:36:49 +0000
+++ clickreviews/tests/test_cr_lint.py	2015-04-15 20:57:04 +0000
@@ -221,7 +221,7 @@
         c = ClickReviewLint(test_name)
         c.check_package_filename()
         r = c.click_report
-        expected_counts = {'info': None, 'warn': 3, 'error': 3}
+        expected_counts = {'info': None, 'warn': 3, 'error': 1}
         self.check_results(r, expected_counts)
 
     def test_check_package_filename_extra_underscore(self):
@@ -232,27 +232,7 @@
         c = ClickReviewLint(test_name)
         c.check_package_filename()
         r = c.click_report
-        expected_counts = {'info': None, 'warn': 2, 'error': 4}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_control_mismatches(self):
-        '''Test check_package_filename() (control mismatches filename)'''
-        self.set_test_control("Package", "test-match")
-        c = ClickReviewLint(self.test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 1}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_namespace_mismatches(self):
-        '''Test check_package_filename() (control mismatches filename)'''
-        test_name = "%s_%s_%s.click" % ("com.example.someuser",
-                                        self.test_control['Version'],
-                                        self.test_control['Architecture'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 2}
+        expected_counts = {'info': None, 'warn': 2, 'error': 2}
         self.check_results(r, expected_counts)
 
     def test_check_package_filename_version_mismatches(self):